Changeset 85121 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Jul 8, 2020 7:33:26 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139061

Message:

iprt/cdefs.h: Refactored the typedef use of DECLCALLBACK as well as DECLCALLBACKMEMBER to wrap the whole expression, similar to the DECLR?CALLBACKMEMBER macros. This allows adding a throw() at the end when compiling with the VC++ compiler to indicate that the callbacks won't throw anything, so we can stop supressing the C5039 warning about passing functions that can potential throw C++ exceptions to extern C code that can't necessarily cope with such (unwind,++). Introduced a few _EX variations that allows specifying different/no calling convention too, as that's handy when dynamically resolving host APIs. Fixed numerous places missing DECLCALLBACK and such. Left two angry @todos regarding use of CreateThread. bugref:9794

Location:

trunk/src/VBox/NetworkServices

Files:

• Dhcpd/VBoxNetDhcpd.cpp (modified) (4 diffs)
• NAT/VBoxNetLwipNAT.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp

@@ -157 +157 @@
     void lwipInit();
 
-    static err_t netifInitCB(netif *pNetif);
+    static err_t netifInitCB(netif *pNetif) RT_NOTHROW_PROTO;
     err_t netifInit(netif *pNetif);
 
-    static err_t netifLinkOutputCB(netif *pNetif, pbuf *pPBuf);
+    static err_t netifLinkOutputCB(netif *pNetif, pbuf *pPBuf) RT_NOTHROW_PROTO;
     err_t netifLinkOutput(pbuf *pPBuf);
 
     static void dhcp4RecvCB(void *arg, struct udp_pcb *pcb, struct pbuf *p,
-                            ip_addr_t *addr, u16_t port);
+                            ip_addr_t *addr, u16_t port) RT_NOTHROW_PROTO;
     void dhcp4Recv(struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
 };
@@ -584 +584 @@
 
 
-/* static */ err_t VBoxNetDhcpd::netifInitCB(netif *pNetif)
+/* static */ err_t VBoxNetDhcpd::netifInitCB(netif *pNetif) RT_NOTHROW_DEF
 {
     AssertPtrReturn(pNetif, ERR_ARG);
@@ -593 +593 @@
 
 
-/* static */ err_t VBoxNetDhcpd::netifLinkOutputCB(netif *pNetif, pbuf *pPBuf)
+/* static */ err_t VBoxNetDhcpd::netifLinkOutputCB(netif *pNetif, pbuf *pPBuf) RT_NOTHROW_DEF
 {
     AssertPtrReturn(pNetif, ERR_ARG);
@@ -607 +607 @@
 /* static */ void VBoxNetDhcpd::dhcp4RecvCB(void *arg, struct udp_pcb *pcb,
                                             struct pbuf *p,
-                                            ip_addr_t *addr, u16_t port)
+                                            ip_addr_t *addr, u16_t port) RT_NOTHROW_DEF
 {
     AssertPtrReturnVoid(arg);

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -183 +183 @@
     static DECLCALLBACK(void) onLwipTcpIpInit(void *arg);
     static DECLCALLBACK(void) onLwipTcpIpFini(void *arg);
-    static err_t netifInit(netif *pNetif);
-    static err_t netifLinkoutput(netif *pNetif, pbuf *pBuf);
+    static err_t netifInit(netif *pNetif) RT_NOTHROW_PROTO;
+    static err_t netifLinkoutput(netif *pNetif, pbuf *pBuf) RT_NOTHROW_PROTO;
     /* static int intNetThreadRecv(RTTHREAD, void *); - unused */
 
@@ -529 +529 @@
  * Callback for netif_add() to initialize the interface.
  */
-/*static*/ err_t VBoxNetLwipNAT::netifInit(netif *pNetif)
+/*static*/ err_t VBoxNetLwipNAT::netifInit(netif *pNetif) RT_NOTHROW_DEF
 {
     err_t rcLwip = ERR_OK;
@@ -591 +591 @@
 
 
-/*static*/ err_t VBoxNetLwipNAT::netifLinkoutput(netif *pNetif, pbuf *pPBuf)
+/*static*/ err_t VBoxNetLwipNAT::netifLinkoutput(netif *pNetif, pbuf *pPBuf) RT_NOTHROW_DEF
 {
     AssertPtrReturn(pNetif, ERR_ARG);