merge with olsr crap
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Mon, 23 Mar 2009 13:16:09 +0100
changeset 4360 bf9c03ebc855
parent 4357 9c638ff9f732 (diff)
parent 4359 8d689bf4405f (current diff)
child 4361 5e4790eea56f
merge with olsr crap
src/routing/olsr/olsr-agent.cc
src/routing/olsr/olsr-agent.h
src/routing/olsr/olsr-routing-table.cc
src/routing/olsr/olsr-routing-table.h
src/routing/olsr/repositories.h
--- a/src/contrib/wscript	Mon Mar 23 09:56:27 2009 +0100
+++ b/src/contrib/wscript	Mon Mar 23 13:16:09 2009 +0100
@@ -50,4 +50,7 @@
 
     if bld.env['ENABLE_LIBXML2']:
         module.source.append ('xml-config.cc')
-        module.uselib = module.uselib + ' LIBXML2'
+        if bld.env['ENABLE_GTK_CONFIG_STORE']:
+            module.uselib = module.uselib + ' LIBXML2'
+        else:
+            module.uselib = 'LIBXML2'
--- a/src/internet-stack/udp-socket-impl.h	Mon Mar 23 09:56:27 2009 +0100
+++ b/src/internet-stack/udp-socket-impl.h	Mon Mar 23 13:16:09 2009 +0100
@@ -105,8 +105,6 @@
   Ptr<UdpL4Protocol> m_udp;
   Ipv4Address m_defaultAddress;
   uint16_t m_defaultPort;
-  Callback<void,Ptr<Socket>,uint32_t,const Address &> m_dummyRxCallback;
-  Callback<void,Ptr<Socket>,uint8_t const*,uint32_t,const Address &> m_rxCallback;
   TracedCallback<Ptr<const Packet> > m_dropTrace;
 
   enum SocketErrno m_errno;
--- a/src/node/socket.cc	Mon Mar 23 09:56:27 2009 +0100
+++ b/src/node/socket.cc	Mon Mar 23 13:16:09 2009 +0100
@@ -252,6 +252,19 @@
     }
 }
 
+void 
+Socket::DoDispose (void)
+{
+  
+  m_connectionSucceeded = MakeNullCallback<void,Ptr<Socket> > ();
+  m_connectionFailed = MakeNullCallback<void,Ptr<Socket> > ();
+  m_connectionRequest = MakeNullCallback<bool,Ptr<Socket>, const Address &> ();
+  m_newConnectionCreated = MakeNullCallback<void,Ptr<Socket>, const Address &> ();
+  m_dataSent = MakeNullCallback<void,Ptr<Socket>, uint32_t> ();
+  m_sendCb = MakeNullCallback<void,Ptr<Socket>, uint32_t> ();
+  m_receivedData = MakeNullCallback<void,Ptr<Socket> > ();
+}
+
 /***************************************************************
  *           Socket Tags
  ***************************************************************/
--- a/src/node/socket.h	Mon Mar 23 09:56:27 2009 +0100
+++ b/src/node/socket.h	Mon Mar 23 13:16:09 2009 +0100
@@ -499,6 +499,7 @@
   void NotifyDataSent (uint32_t size);
   void NotifySend (uint32_t spaceAvailable);
   void NotifyDataRecv (void);
+  virtual void DoDispose (void);
 private:
   Callback<void, Ptr<Socket> >   m_connectionSucceeded;
   Callback<void, Ptr<Socket> >   m_connectionFailed;