- Timestamp:
- Oct 12, 2007 5:26:21 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 25260
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/pdmdrv.h
r4787 r5266 555 555 /** 556 556 * Creates a PDM thread. 557 * 558 * This differs from the RTThreadCreate() API in that PDM takes care of suspending, 557 * 558 * This differs from the RTThreadCreate() API in that PDM takes care of suspending, 559 559 * resuming, and destroying the thread as the VM state changes. 560 * 560 * 561 561 * @returns VBox status code. 562 562 * @param pDrvIns The driver instance. … … 668 668 */ 669 669 #define PDMDRV_SET_RUNTIME_ERROR(pDrvIns, fFatal, pszErrorID, pszError) \ 670 PDMDrvHlpVMSet Error(pDrvIns, fFatal, pszErrorID, "%s", pszError)670 PDMDrvHlpVMSetRuntimeError(pDrvIns, fFatal, pszErrorID, "%s", pszError) 671 671 672 672 #endif /* IN_RING3 */ -
trunk/src/VBox/Devices/Network/DrvNAT.cpp
r4071 r5266 52 52 /** NAT state for this instance. */ 53 53 PNATState pNATState; 54 /** Flag whether a NAT ping warning has been shown. */ 55 bool fSuppressPingWarning; 54 56 } DRVNAT, *PDRVNAT; 55 57 … … 238 240 LogFlow(("slirp_output END %x %d\n", pu8Buf, cb)); 239 241 } 242 243 244 /** 245 * Function called by slirp to signal that a ping had to be dropped. 246 */ 247 void slirp_cannot_ping(void *pvUser) 248 { 249 PDRVNAT pData = (PDRVNAT)pvUser; 250 251 Assert(pData); 252 253 /** Happens during termination */ 254 if (!RTCritSectIsOwner(&pData->CritSect)) 255 return; 256 257 if (!pData->fSuppressPingWarning) 258 { 259 pData->fSuppressPingWarning = true; 260 PDMDRV_SET_RUNTIME_ERROR(pData->pDrvIns, false, "NAT_PING", "The guest OS sent out a ping request which cannot be handled by NAT"); 261 } 262 } 263 240 264 241 265 /** -
trunk/src/VBox/Devices/Network/slirp/ip_icmp.c
r1076 r5266 115 115 icmp_reflect(pData, m); 116 116 } else { 117 #if 1 118 slirp_cannot_ping(pData->pvUser); 119 #else 117 120 struct socket *so; 118 121 struct sockaddr_in addr; … … 158 161 udp_detach(pData, so); 159 162 } 163 #endif 160 164 } /* if ip->ip_dst.s_addr == alias_addr.s_addr */ 161 165 break; -
trunk/src/VBox/Devices/Network/slirp/libslirp.h
r3693 r5266 42 42 int slirp_can_output(void * pvUser); 43 43 void slirp_output(void * pvUser, const uint8_t *pkt, int pkt_len); 44 void slirp_cannot_ping(void * pvUser); 44 45 45 46 int slirp_redir(PNATState pData, int is_udp, int host_port,
Note:
See TracChangeset
for help on using the changeset viewer.