vbox的更動 46969 路徑 trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

時間撮記:

2013-7-4 上午06:35:01 (11 年 以前)

作者:

vboxsync

訊息:

backed out r86967,r86968,r86969,r86970,r86971,r86972,r86973,r86975,r86976.
will fix build locally.

檔案:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h (修改) (4 筆差異)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -18 +18 @@
 #ifndef ___VBoxNetBaseService_h___
 #define ___VBoxNetBaseService_h___
-
 #include <iprt/critsect.h>
 class VBoxNetBaseService
@@ -33 +32 @@
     int                 sendBufferOnWire(PCINTNETSEG pSg, int cSg, size_t cbBuffer);
     void                flushWire();
-
     virtual void        usage(void) = 0;
-    virtual int         run(void) = 0;
+    virtual void        run(void) = 0;
+    virtual int         init(void);
     virtual int         parseOpt(int rc, const RTGETOPTUNION& getOptVal) = 0;
 
-    virtual int         init(void);
-
-    /* VirtualBox instance */
-    ComPtr<IVirtualBox> virtualbox;
-
-protected:
-    /**
-     * Print debug message depending on the m_cVerbosity level.
-     *
-     * @param   iMinLevel       The minimum m_cVerbosity level for this message.
-     * @param   fMsg            Whether to dump parts for the current DHCP message.
-     * @param   pszFmt          The message format string.
-     * @param   ...             Optional arguments.
-     */
-    void debugPrint(int32_t iMinLevel, bool fMsg, const char *pszFmt, ...) const
-    {
-        if (iMinLevel <= m_cVerbosity)
-        {
-            va_list va;
-            va_start(va, pszFmt);
-            debugPrintV(iMinLevel, fMsg, pszFmt, va);
-            va_end(va);
-        }
-    }
-
-    virtual void debugPrintV(int32_t iMinLevel, bool fMsg, const char *pszFmt, va_list va) const;
-
+    inline void         debugPrint( int32_t iMinLevel, bool fMsg,  const char *pszFmt, ...) const;
+    void                debugPrintV(int32_t iMinLevel, bool fMsg,  const char *pszFmt, va_list va) const;
+public:
     /** @name The server configuration data members.
      * @{ */
@@ -74 +49 @@
     RTNETADDRIPV4       m_Ipv4Address;
     RTNETADDRIPV4       m_Ipv4Netmask;
+    /* cs for syncing */
+    RTCRITSECT          m_csThis;
     /** @} */
     /** @name The network interface
@@ -89 +66 @@
 private:
     PRTGETOPTDEF getOptionsPtr();
-
-    /* cs for syncing */
-    RTCRITSECT          m_csThis;
-
     /** @} */
 };