lib/netif: rename netsim.h -> netif.h

lib/simbricks/netif/netsim.c → lib/simbricks/netif/netif.c

@@ -22,6 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <simbricks/netif/netif.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,8 +31,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <simbricks/netif/netsim.h>
-
 #include "lib/simbricks/netif/internal.h"
 #include <simbricks/proto/base.h>
 

lib/simbricks/netif/netsim.h → lib/simbricks/netif/netif.h

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SIMBRICKS_NETIF_NETSIM_H_
-#define SIMBRICKS_NETIF_NETSIM_H_
+#ifndef SIMBRICKS_NETIF_NETIF_H_
+#define SIMBRICKS_NETIF_NETIF_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -67,4 +67,4 @@ void SimbricksNetIfAdvanceEpoch(uint64_t timestamp, uint64_t sync_delay,
 uint64_t SimbricksNetIfAdvanceTime(uint64_t timestamp, uint64_t sync_delay,
                              int sync_mode);
 
-#endif  // SIMBRICKS_NETIF_NETSIM_H_
+#endif  // SIMBRICKS_NETIF_NETIF_H_

lib/simbricks/netif/rules.mk

@@ -22,11 +22,11 @@
 
 include mk/subdir_pre.mk
 
-lib_netsim := $(d)libnetsim_common.a
+lib_netif := $(d)libnetif_common.a
 
-OBJS := $(addprefix $(d),netsim.o utils.o)
+OBJS := $(addprefix $(d),netif.o utils.o)
 
-$(lib_netsim): $(OBJS)
+$(lib_netif): $(OBJS)
 
-CLEAN := $(lib_netsim) $(OBJS)
+CLEAN := $(lib_netif) $(OBJS)
 include mk/subdir_post.mk

ns-3 @ 6cbdef11

-Subproject commit 763b902bbcde6cc675c9210db9abaa2bb3e1c4d4
+Subproject commit 6cbdef1111ee864c91a0dc65177f30e8a91ab4dc

sims/external/rules.mk

@@ -59,7 +59,7 @@ $(QEMU): $(d)qemu/ready
 $(d)ns-3:
 	git clone git@github.com:simbricks/ns-3.git $@
 
-$(d)ns-3/ready: $(d)ns-3 $(lib_netsim)
+$(d)ns-3/ready: $(d)ns-3 $(lib_netif)
 	+cd $< && COSIM_PATH=$(abspath $(base_dir)) ./cosim-build.sh configure
 	touch $@
 

sims/net/switch/net_switch.cc

@@ -34,7 +34,7 @@
 #include <vector>
 
 extern "C" {
-#include <simbricks/netif/netsim.h>
+#include <simbricks/netif/netif.h>
 #include <simbricks/proto/base.h>
 };
 

sims/net/switch/rules.mk

@@ -28,7 +28,7 @@ OBJS := $(d)net_switch.o
 
 $(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
-$(bin_net_switch): $(OBJS) $(lib_netsim) -lpcap
+$(bin_net_switch): $(OBJS) $(lib_netif) -lpcap
 
 CLEAN := $(bin_net_switch) $(OBJS)
 ALL := $(bin_net_switch)

sims/net/tap/net_tap.c

@@ -33,7 +33,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <simbricks/netif/netsim.h>
+#include <simbricks/netif/netif.h>
 
 // #define DEBUG_PKTMETA
 

sims/net/tap/rules.mk

@@ -28,7 +28,7 @@ OBJS := $(d)net_tap.o
 
 $(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
-$(bin_net_tap): $(OBJS) $(lib_netsim) -lpcap -lpthread
+$(bin_net_tap): $(OBJS) $(lib_netif) -lpcap -lpthread
 
 CLEAN := $(bin_net_tap) $(OBJS)
 ALL := $(bin_net_tap)

sims/net/wire/net_wire.c

@@ -36,7 +36,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <simbricks/netif/netsim.h>
+#include <simbricks/netif/netif.h>
 #include <simbricks/proto/base.h>
 
 static uint64_t sync_period = (500 * 1000ULL);  // 500ns

sims/net/wire/rules.mk

@@ -28,7 +28,7 @@ OBJS := $(d)net_wire.o
 
 $(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
-$(bin_net_wire): $(OBJS) $(lib_netsim) -lpcap
+$(bin_net_wire): $(OBJS) $(lib_netif) -lpcap
 
 CLEAN := $(bin_net_wire) $(OBJS)
 ALL := $(bin_net_wire)