*** ns-allinone-3.12.1.orig/ns-3.12.1/src/internet/model/ipv4-raw-socket-impl.cc Wed May 25 21:42:27 2011 --- ns-allinone-3.12.1/ns-3.12.1/src/internet/model/ipv4-raw-socket-impl.cc Wed Aug 31 16:17:43 2011 *************** *** 1,5 **** --- 1,7 ---- /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ #include + #include + #include #include "ipv4-raw-socket-impl.h" #include "ipv4-l3-protocol.h" #include "icmpv4.h" *** ns-allinone-3.12.1.orig/ns-3.12.1/src/internet/model/ipv6-raw-socket-impl.cc Wed May 25 21:42:27 2011 --- ns-allinone-3.12.1/ns-3.12.1/src/internet/model/ipv6-raw-socket-impl.cc Wed Aug 31 16:18:49 2011 *************** *** 19,24 **** --- 19,26 ---- */ #include + #include + #include #include "ns3/inet6-socket-address.h" #include "ns3/node.h" #include "ns3/packet.h" *** ns-allinone-3.12.1.orig/ns-3.12.1/src/spectrum/model/spectrum-value.cc Wed May 25 21:42:28 2011 --- ns-allinone-3.12.1/ns-3.12.1/src/spectrum/model/spectrum-value.cc Wed Aug 31 16:27:52 2011 *************** *** 23,28 **** --- 23,31 ---- #include #include + #ifdef __FreeBSD__ + #define log2(x) (log(x)/M_LN2) + #endif NS_LOG_COMPONENT_DEFINE ("SpectrumValue"); *** ns-allinone-3.12.1.orig/ns-3.12.1/src/lte/model/amc-module.cc Wed May 25 21:42:27 2011 --- ns-allinone-3.12.1/ns-3.12.1/src/lte/model/amc-module.cc Wed Aug 31 16:31:35 2011 *************** *** 23,28 **** --- 23,32 ---- #include #include + #ifdef __FreeBSD__ + #define log2(x) (log(x)/M_LN2) + #endif + NS_LOG_COMPONENT_DEFINE ("AmcModule"); namespace ns3 { *** ns-allinone-3.12.1.orig/ns-3.12.1/src/internet/test/ipv4-raw-test.cc Wed May 25 21:42:27 2011 --- ns-allinone-3.12.1/ns-3.12.1/src/internet/test/ipv4-raw-test.cc Wed Aug 31 16:33:49 2011 *************** *** 44,49 **** --- 44,51 ---- #include #include #include + #include + #include namespace ns3 { static void --- ns-allinone-3.12.1.orig/ns-3.12.1/src/spectrum/test/spectrum-ideal-phy-test.cc 2011-08-27 21:36:05.000000000 +0100 +++ ns-allinone-3.12.1/ns-3.12.1/src/spectrum/test/spectrum-ideal-phy-test.cc 2011-09-02 17:55:09.000000000 +0100 @@ -49,6 +49,10 @@ #include #include +#ifdef __FreeBSD__ +#define log2(x) (log(x)/M_LN2) +#endif + NS_LOG_COMPONENT_DEFINE ("SpectrumIdealPhyTest"); namespace ns3 { --- ns-allinone-3.12.1.orig/ns-3.12.1/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc 2011-08-27 21:36:05.000000000 +0100 +++ ns-allinone-3.12.1/ns-3.12.1/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc 2011-09-02 18:01:16.000000000 +0100 @@ -40,6 +40,10 @@ #include #include +#ifdef __FreeBSD__ +#define log2(x) (log(x)/M_LN2) +#endif + NS_LOG_COMPONENT_DEFINE ("TestAdhocOfdmAloha"); using namespace ns3; --- ns-allinone-3.12.1/ns-3.12.1/src/core/model/system-path.cc 2011-08-27 21:36:05.000000000 +0100 +++ ns-allinone-3.12.1/ns-3.12.1/src/core/model/system-path.cc 2011-09-07 14:09:22.000000000 +0100 @@ -20,6 +20,11 @@ #include #endif /* __APPLE__ */ +#ifdef __FreeBSD__ +#include +#include +#endif + #if defined (__win32__) #define SYSTEM_PATH_SEP "\\" @@ -110,6 +115,20 @@ filename = buffer; free (buffer); } +#elif defined (__FreeBSD__) + { + int mib[4]; + size_t bufSize = 1024; + char *buf = (char *) malloc(bufSize); + + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PATHNAME; + mib[3] = -1; + + sysctl(mib, 4, buf, &bufSize, NULL, 0); + filename = buf; + } #endif return Dirname (filename); }