modify the dynamic library name

kcavi · kcavi · commit 7e7d71ef6eeb · 2021-08-10T09:05:30.000-07:00
diff --git a/uinet/Makefile b/uinet/Makefile
@@ -1,7 +1,19 @@
+ifeq ($(V),1)
+	Q :=
+else
+	Q := -s
+endif
+
+export MAKE := $(MAKE) $(Q)
+
 all:
-	make -C lib
-	make -C example
+	@echo "make uinet at:"`date`
+	@$(MAKE) -C lib
+	@$(MAKE) -C example
+	@$(MAKE) -C tools
 
 clean:
-	make -C lib clean
-	make -C example clean
+	@echo "make clean at:"`date`
+	@$(MAKE) -C lib clean
+	@$(MAKE) -C example clean
+	@$(MAKE) -C tools clean
diff --git a/uinet/example/Makefile b/uinet/example/Makefile
@@ -1,18 +1,15 @@
 TOPDIR=..
 
-ifeq ($(FF_PATH),)
-	FF_PATH=${TOPDIR}
-endif
-
-
-LIBS+= -L${FF_PATH}/lib -Wl,--whole-archive,-lfstack,--no-whole-archive
+LIBS+= -L${TOPDIR}/lib -Wl,--whole-archive,-lnetstack,--no-whole-archive
 LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -pthread
 
 TARGET="helloworld"
 all:
+	@echo "build helloworld"
 	$(CC) -g -I../lib -o ${TARGET} main.c ${LIBS}
-	$(CC) -g -I../lib -o ${TARGET}_epoll main_epoll.c ${LIBS}
 
-.PHONY: clean
+
 clean:
-	rm -f *.o ${TARGET} ${TARGET}_epoll
+	rm -f *.o ${TARGET}
+
+.PHONY: clean
diff --git a/uinet/example/main_epoll.c b/uinet/example/main_epoll.c
diff --git a/uinet/lib/Makefile b/uinet/lib/Makefile
@@ -323,7 +323,7 @@ HOST_SRCS = ${FF_HOST_SRCS}
 OBJS+= $(patsubst %.c,%.o,${SRCS})
 HOST_OBJS+= $(patsubst %.c,%.o,${HOST_SRCS})
 
-all: libfstack.a
+all: libnetstack.a
 
 
 #
@@ -333,21 +333,23 @@ all: libfstack.a
 # externally available.
 #
 
-libfstack.a:  ${HOST_OBJS}  ${OBJS}
+libnetstack.a:  ${HOST_OBJS}  ${OBJS}
 	ar -cqs $@ ${OBJS} ${HOST_OBJS}
 
 
 
 ${HOST_OBJS}: %.o: %.c
-	${HOST_C}
+	@echo "  CC " $@
+	@${HOST_C}
 
 
 ${OBJS}: %.o: %.c
+	@echo "  CC " $@
 	${NORMAL_C}
 
 
 .PHONY: clean
 clean:
-	rm -f libfstack.a
+	rm -f libnetstack.a
 	rm -f  ${HOST_OBJS} ${OBJS} ${PROGRAM} 
 
diff --git a/uinet/lib/packet_process.c b/uinet/lib/packet_process.c
@@ -212,8 +212,10 @@ void msg_loop(void)
 	ff_thread_set_name("msg_loop");
 
 	tmp = malloc(10240);
+	packet_fd = socket(PF_PACKET,SOCK_RAW,protocol != 0?htons(protocol):htons(ETH_P_ALL));
 
-	if ( (packet_fd=socket(PF_PACKET,SOCK_RAW,protocol != 0?htons(protocol):htons(ETH_P_ALL)))<0) {
+	if(packet_fd < 0) 
+	{
 		perror("create socket failed");
 		return;
 	}
diff --git a/uinet/tools/compat/ff_ipc.c b/uinet/tools/compat/ff_ipc.c
@@ -33,6 +33,8 @@
 #include <rte_mempool.h>
 #include <rte_malloc.h>
 #endif
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 //#include "ff_ipc.h"
