ethertap.cc (13766:4ecebdee8da4) | ethertap.cc (13784:1941dc118243) |
---|---|
1/* 2 * Copyright (c) 2003-2005 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 145 unchanged lines hidden (view full) --- 154EtherTapBase::stopPolling() 155{ 156 assert(event); 157 delete event; 158 event = NULL; 159} 160 161 | 1/* 2 * Copyright (c) 2003-2005 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 145 unchanged lines hidden (view full) --- 154EtherTapBase::stopPolling() 155{ 156 assert(event); 157 delete event; 158 event = NULL; 159} 160 161 |
162EtherInt* 163EtherTapBase::getEthPort(const std::string &if_name, int idx) | 162Port & 163EtherTapBase::getPort(const std::string &if_name, PortID idx) |
164{ | 164{ |
165 if (if_name == "tap") { 166 if (interface->getPeer()) 167 panic("Interface already connected to\n"); 168 return interface; 169 } 170 return NULL; | 165 if (if_name == "tap") 166 return *interface; 167 return SimObject::getPort(if_name, idx); |
171} 172 173bool 174EtherTapBase::recvSimulated(EthPacketPtr packet) 175{ 176 if (dump) 177 dump->dump(packet); 178 --- 311 unchanged lines hidden --- | 168} 169 170bool 171EtherTapBase::recvSimulated(EthPacketPtr packet) 172{ 173 if (dump) 174 dump->dump(packet); 175 --- 311 unchanged lines hidden --- |