--- a/doc/source/dce-user-syscalls.rst	Mon Oct 14 11:45:08 2013 +0200
+++ b/doc/source/dce-user-syscalls.rst	Wed Nov 27 16:41:55 2013 +0100
@@ -37,7 +37,7 @@
 
  NATIVE (strfry)
 
- This is the case of the symbol ``strfry()``, which we don't have to reimplement.
+ This is the case of the symbol ``strfry()``, which we don't have to reimplement. But you may need to add include file that defines the symbol (strfry()) at model/libc-dce.cc.
 
  If the symbol needs to reimplemented for DCE, you may add as follows.
 

--- a/example/dce-mptcp-lte-wifi.cc	Mon Oct 14 11:45:08 2013 +0200
+++ b/example/dce-mptcp-lte-wifi.cc	Wed Nov 27 16:41:55 2013 +0100
@@ -94,7 +94,7 @@
   PointToPointHelper pointToPoint;
   NetDeviceContainer devices1, devices2;
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   YansWifiPhyHelper phy;
 
   Ipv4AddressHelper address1, address2;

--- a/model/dce-fd.cc	Mon Oct 14 11:45:08 2013 +0200
+++ b/model/dce-fd.cc	Wed Nov 27 16:41:55 2013 +0100
@@ -320,16 +320,17 @@
     }
 
   void *buf = malloc (count);
+  void *bufp = buf;
   for (int i = 0; i < iovcnt; ++i)
     {
-      memcpy (buf, iov[i].iov_base, iov[i].iov_len);
-      buf += iov[i].iov_len;
+      memcpy (bufp, iov[i].iov_base, iov[i].iov_len);
+      bufp += iov[i].iov_len;
     }
 
   UnixFd *unixFd = current->process->openFiles[fd]->GetFileInc ();
   int retval = unixFd->Write (buf, count);
   FdDecUsage (fd);
-  free (buf - count);
+  free (buf);
 
   return retval;
 }

--- a/model/linux-socket-fd-factory.cc	Mon Oct 14 11:45:08 2013 +0200
+++ b/model/linux-socket-fd-factory.cc	Wed Nov 27 16:41:55 2013 +0100
@@ -886,7 +886,6 @@
 {
   GET_CURRENT (socket << my_addr << addrlen << flags);
   struct SimSocket *newSocket;
-  // XXX: handle O_NONBLOCK
   m_loader->NotifyStartExecute ();
   int retval = m_exported->sock_accept (socket, &newSocket, flags);
   m_loader->NotifyEndExecute ();

--- a/wscript	Mon Oct 14 11:45:08 2013 +0200
+++ b/wscript	Wed Nov 27 16:41:55 2013 +0100
@@ -77,6 +77,8 @@
         else:
             os.environ['PKG_CONFIG_PATH']+= ":" + os.path.join(Options.options.with_ns3, 'lib', 'pkgconfig')
 
+        conf.env.append_value('NS3_EXECUTABLE_PATH', os.path.join(conf.env['NS3_DIR'], 'bin'))
+
     ns3waf.check_modules(conf, ['core', 'network', 'internet'], mandatory = True)
     ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)
     ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)