Base OSPF code compiling inside Docker container

Author: migueldgoncalves

Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu:16.04
+
+#  Ubuntu 16.04 or earlier is required, as in more recent Linux kernel versions linux/ip.h and netinet/ip.h (included by
+#  linux/if_tunnel.h) enter in conflict by defining data structure with same name 'iphdr'
+
+WORKDIR /ospf
+
+# DEBIAN_FRONTEND environement variable set to "noninteractive" to overcome tzdata prompt
+# tcl is used by the base OSPF implementation - Development package is required
+
+RUN apt update && DEBIAN_FRONTEND="noninteractive" apt install --yes python3 \
+python3-pip \
+iproute2 \
+iputils-ping \
+traceroute \
+tcl-dev
+
+VOLUME /ospf

README.md

@@ -1,4 +1,12 @@
 # ospf_cplusplus_python_integration
-Experiments on integration of Python extensions with C++ OSPF base implementation
+Experiments on integration of Python extensions with C++ OSPF base implementation.
 
-The base code is the Release 2.0 of the ospfd routing software, created by John T. Moy, available at <http://www.ospf.org>.
+The base code is the Release 2.16 of the ospfd routing software created by John T. Moy, and described in the book [OSPF Complete Implementation](https://dl.acm.org/doi/book/10.5555/1481642).
+
+Executed in Docker containers running Ubuntu 16.04.
+
+## See also
+
+* <http://www.ospf.org> - Original source code by John T. Moy, and respective patches
+
+* <https://github.com/pfa/ospfd-diffs> - Most of required patches to run base code in Ubuntu 16.04

linux/linux.C

@@ -228,14 +228,14 @@ InMask masks[33] = {
     0xffffffffL
 };
 
-bool get_prefix(char *prefix, InAddr &net, InMask &mask)
+bool get_prefix(const char *prefix, InAddr &net, InMask &mask)
 
 {
     char *string;
     char netstr[16];
     int len;
 
-    if (!(string = index(prefix, '/')))
+    if (!(string = index((char *) prefix, '/')))
 	return(false);
     memcpy(netstr, prefix, string-prefix);
     netstr[string-prefix] = '\0';

linux/lsa_prn.C

@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <tcl.h>
+#include <tcl/tcl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

linux/machdep.h

@@ -90,4 +90,4 @@ inline uns16 hton16(uns16 value)
 }
 
 // External definitions
-extern "C" char *strptime(char *buf, const char *format, const struct tm *tm);
+//extern "C" char *strptime(char *buf, const char *format, const struct tm *tm);

linux/ospfd_browser.C

@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <tcl.h>
+#include <tcl/tcl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -1786,11 +1786,11 @@ char *page_footer = "\
 
 char *error_page = "\
     <table cellpadding=0 cellspacing=0 border=0 width=400>\n\
-    <center>
+    <center>\
     <tr>\n\
     <td align=\"center\">\n\
     Data connection error:\n\
-    <br>
+    <br>\
     $operation$: $errno$\n\
     </td>\n\
     </tr>\n\

linux/ospfd_linux.C

@@ -23,7 +23,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
-#include <tcl.h>
+#include <tcl/tcl.h>
 #if LINUX_VERSION_CODE >= LINUX22
 #include <asm/types.h>
 #include <sys/socket.h>
@@ -61,7 +61,7 @@ LinuxOspfd *ospfd_sys;
 char buffer[MAX_IP_PKTSIZE];
 
 // External declarations
-bool get_prefix(char *prefix, InAddr &net, InMask &mask);
+bool get_prefix(const char *prefix, InAddr &net, InMask &mask);
 
 /* Signal handlers
  */
@@ -497,16 +497,16 @@ LinuxOspfd::~LinuxOspfd()
  * application.
  */
 
-int SetRouterID(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendGeneral(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendArea(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendAggregate(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendHost(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendInterface(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendVL(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendNeighbor(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendExtRt(ClientData, Tcl_Interp *, int, char *argv[]);
-int SendMD5Key(ClientData, Tcl_Interp *, int, char *argv[]);
+int SetRouterID(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendGeneral(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendArea(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendAggregate(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendHost(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendInterface(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendVL(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendNeighbor(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendExtRt(ClientData, Tcl_Interp *, int, const char *argv[]);
+int SendMD5Key(ClientData, Tcl_Interp *, int, const char *argv[]);
 
 /* Read the ospfd config out of the file /etc/ospfd.conf
  */
@@ -813,7 +813,7 @@ void LinuxOspfd::add_direct(BSDPhyInt *phyp, InAddr addr, InMask mask)
  * or a name like "eth0".
  */
 
-bool LinuxOspfd::parse_interface(char *arg, in_addr &addr, BSDPhyInt *&phyp)
+bool LinuxOspfd::parse_interface(const char *arg, in_addr &addr, BSDPhyInt *&phyp)
 
 {
     phyp = 0;
@@ -851,7 +851,7 @@ bool LinuxOspfd::parse_interface(char *arg, in_addr &addr, BSDPhyInt *&phyp)
  * been set.
  */
 
-int SetRouterID(ClientData, Tcl_Interp *, int, char *argv[])
+int SetRouterID(ClientData, Tcl_Interp *, int, const char *argv[])
 
 {
     new_router_id = ntoh32(inet_addr(argv[1]));
@@ -865,7 +865,7 @@ int SetRouterID(ClientData, Tcl_Interp *, int, char *argv[])
  * If first time, create OSPF protocol instance.
  */
 
-int SendGeneral(ClientData, Tcl_Interp *, int, char *argv[])
+int SendGeneral(ClientData, Tcl_Interp *, int, const char *argv[])
 
 {
     CfgGen m;
@@ -890,7 +890,7 @@ int SendGeneral(ClientData, Tcl_Interp *, int, char *argv[])
 /* Dowload configuration of a single area
  */
 
-int SendArea(ClientData, Tcl_Interp *, int, char *argv[])
+int SendArea(ClientData, Tcl_Interp *, int, const char *argv[])
 
 {
     CfgArea m;
@@ -904,7 +904,7 @@ int SendArea(ClientData, Tcl_Interp *, int, char *argv[])
     return(TCL_OK);
 }
 
-int SendAggregate(ClientData, Tcl_Interp *, int, char *argv[])
+int SendAggregate(ClientData, Tcl_Interp *, int, const char *argv[])
 {
     CfgRnge m;
     InAddr net;
@@ -921,7 +921,7 @@ int SendAggregate(ClientData, Tcl_Interp *, int, char *argv[])
     return(TCL_OK);
 }
 
-int SendHost(ClientData, Tcl_Interp *, int, char *argv[])
+int SendHost(ClientData, Tcl_Interp *, int, const char *argv[])
 {
     CfgHost m;
     InAddr net;
@@ -943,7 +943,7 @@ int SendHost(ClientData, Tcl_Interp *, int, char *argv[])
  * for point-to-point addresses, the other end of the link.
  */
 
-int SendInterface(ClientData, Tcl_Interp *, int, char *argv[])
+int SendInterface(ClientData, Tcl_Interp *, int, const char *argv[])
 
 {
     CfgIfc m;
@@ -999,7 +999,7 @@ int SendInterface(ClientData, Tcl_Interp *, int, char *argv[])
     return(TCL_OK);
 }
 
-int SendVL(ClientData, Tcl_Interp *, int, char *argv[])
+int SendVL(ClientData, Tcl_Interp *, int, const char *argv[])
 {
     CfgVL m;
 
@@ -1016,7 +1016,7 @@ int SendVL(ClientData, Tcl_Interp *, int, char *argv[])
     return(TCL_OK);
 }
 
-int SendNeighbor(ClientData, Tcl_Interp *, int, char *argv[])
+int SendNeighbor(ClientData, Tcl_Interp *, int, const char *argv[])
 {
     CfgNbr m;
 
@@ -1027,7 +1027,7 @@ int SendNeighbor(ClientData, Tcl_Interp *, int, char *argv[])
     return(TCL_OK);
 }
 
-int SendExtRt(ClientData, Tcl_Interp *, int, char *argv[])
+int SendExtRt(ClientData, Tcl_Interp *, int, const char *argv[])
 {
     CfgExRt m;
     InAddr net;
@@ -1049,7 +1049,7 @@ int SendExtRt(ClientData, Tcl_Interp *, int, char *argv[])
     return(TCL_OK);
 }
 
-int SendMD5Key(ClientData, Tcl_Interp *, int, char *argv[])
+int SendMD5Key(ClientData, Tcl_Interp *, int, const char *argv[])
 {
     CfgAuKey m;
     in_addr addr;

linux/ospfd_linux.h

@@ -70,7 +70,7 @@ class LinuxOspfd : public Linux {
     void rtentry_prepare(InAddr, InMask, MPath *mpp);
     void add_direct(class BSDPhyInt *, InAddr, InMask);
     int get_phyint(InAddr);
-    bool parse_interface(char *, in_addr &, BSDPhyInt * &);
+    bool parse_interface(const char *, in_addr &, BSDPhyInt * &);
     void raw_receive(int fd);
     void netlink_receive(int fd);
     void process_routerid_change();
@@ -85,12 +85,16 @@ class LinuxOspfd : public Linux {
  */
 
 class BSDPhyInt : public AVLitem {
-    char *phyname;
+public:
+    inline int phyint();
     InAddr addr;
-    short flags;
     InMask mask;
-    InAddr dstaddr;	// Other end of p-p link
     int mtu;
+    short flags;
+
+private:
+    char *phyname;
+    InAddr dstaddr;	// Other end of p-p link
     bool tunl;
     int vifno;
     InAddr tsrc;	// Tunnel endpoint addresses
@@ -100,7 +104,6 @@ class BSDPhyInt : public AVLitem {
     friend class LinuxOspfd;
     friend int SendInterface(void *,struct Tcl_Interp *, int,char *[]);
     friend int SendMD5Key(void *, Tcl_Interp *, int, char *argv[]);
-    inline int phyint();
 };
 
 inline BSDPhyInt::BSDPhyInt(int index) : AVLitem(index, 0)

linux/ospfd_mon.C

@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <tcl.h>
+#include <tcl/tcl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>