[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "modular-transport-refactor" updated.

[Commits to the Asterisk SCF project code repositories]

branch "modular-transport-refactor" has been updated
       via  6d3ef9e35e467d718a8f616eb2a85fb4b2958af0 (commit)
      from  d546f6a31b6c8795fcd99264f3b493abac7202c4 (commit)

Summary of changes:
 src/STUNTransport.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 6d3ef9e35e467d718a8f616eb2a85fb4b2958af0
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jun 28 12:15:32 2011 -0230

    Fix windows build issues.

diff --git a/src/STUNTransport.cpp b/src/STUNTransport.cpp
index d7a2102..a560a40 100644
--- a/src/STUNTransport.cpp
+++ b/src/STUNTransport.cpp
@@ -93,14 +93,14 @@ private:
     //
     // Integration methods for STUN transport.
     //
-    static pj_status_t sendMsgImpl(pjsip_transport* transport, pjsip_tx_data* data, const pj_sockaddr_t* remoteAddress,
+    static pj_status_t sendMsgImplCB(pjsip_transport* transport, pjsip_tx_data* data, const pj_sockaddr_t* remoteAddress,
         int remoteAddressLength, void* token, pjsip_transport_callback callback)
     {
         STUNTransport* t = reinterpret_cast<STUNTransport*>(transport->data);
         return t->sendData(data, remoteAddress, remoteAddressLength, token, callback);
     }
 
-    static pj_status_t shutdownImpl(pjsip_transport*)
+    static pj_status_t shutdownImplCB(pjsip_transport*)
     {
         //
         // The STUN transport doesn't have a distinct shutdown.
@@ -108,7 +108,7 @@ private:
         return PJ_SUCCESS;
     }
 
-    static pj_status_t destroyImpl(pjsip_transport* transport)
+    static pj_status_t destroyImplCB(pjsip_transport* transport)
     {
         STUNTransport* t = reinterpret_cast<STUNTransport*>(transport->data);
         t->destroy();
@@ -293,9 +293,9 @@ private:
         assert(transport != 0);
         memset(transport.get(), 0, sizeof *transport);
         strcpy(transport->obj_name, "ASCFSTUN"); // TODO: proper name initialization.
-        transport->send_msg = &sendMsgImpl;
-        transport->do_shutdown = &shutdownImpl;
-        transport->destroy = &destroyImpl;
+        transport->send_msg = &sendMsgImplCB;
+        transport->do_shutdown = &shutdownImplCB;
+        transport->destroy = &destroyImplCB;
         transport->endpt = mEndpoint;
         transport->tpmgr = pjsip_endpt_get_tpmgr(mEndpoint);
         transport->pool = mModule->getPool();

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git