Fix build / CI

Author: danielinux

.github/workflows/linux.yml

@@ -25,7 +25,8 @@ jobs:
       - name: Build linux tests
         run: |
           mkdir -p build/port
-          make CFLAGS="-DWOLFIP_RAWSOCKETS=1 -DWOLFIP_PACKET_SOCKETS=1"
+          make EXTRA_CFLAGS="-DWOLFIP_RAWSOCKETS=1 -DWOLFIP_PACKET_SOCKETS=1"
+          make EXTRA_CFLAGS="-DWOLFIP_RAWSOCKETS=1 -DWOLFIP_PACKET_SOCKETS=1" build/raw_ping build/packet_ping
 
       - name: Run standalone "event loop" test
         timeout-minutes: 5

Makefile

@@ -1,6 +1,8 @@
 CC?=gcc
 CFLAGS:=-Wall -Werror -Wextra -I. -D_GNU_SOURCE
 CFLAGS+=-g -ggdb -Wdeclaration-after-statement
+EXTRA_CFLAGS?=
+CFLAGS+=$(EXTRA_CFLAGS)
 LDFLAGS+=-pthread
 # additional debug flags:
 #   CFLAGS+=-DDEBUG_TAP
@@ -155,7 +157,7 @@ endif
 EXE=build/tcpecho build/tcp_netcat_poll build/tcp_netcat_select \
 	build/test-evloop build/test-dns build/test-wolfssl-forwarding \
 	build/test-ttl-expired build/test-wolfssl build/test-httpd \
-	build/ipfilter-logger build/raw_ping build/packet_ping \
+	build/ipfilter-logger \
 	build/test-esp build/esp-server
 LIB=libwolfip.so
 

src/wolfip.c

@@ -3891,6 +3891,9 @@ static struct packetsocket *wolfIP_packetsocket_from_fd(struct wolfIP *s, int so
 int wolfIP_sock_socket(struct wolfIP *s, int domain, int type, int protocol)
 {
     struct tsocket *ts;
+#if WOLFIP_RAWSOCKETS || WOLFIP_PACKET_SOCKETS
+    int base_type = type;
+#endif
     if (domain != AF_INET)
         goto packet_try;
     if (type == IPSTACK_SOCK_STREAM) {
@@ -3914,7 +3917,7 @@ int wolfIP_sock_socket(struct wolfIP *s, int domain, int type, int protocol)
         }
     }
 #if WOLFIP_RAWSOCKETS
-    else if (type == IPSTACK_SOCK_RAW) {
+    else if (base_type == IPSTACK_SOCK_RAW) {
         struct rawsocket *rs;
         int hdrincl = 0;
 #ifdef IPPROTO_RAW