Make CI workflow.

sobomax · sobomax · commit b1b2007e0027 · 2026-04-29T06:51:34.000-07:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,76 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  posix:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu 22.04 GCC
+            os: ubuntu-22.04
+            cc: gcc
+            cxx: g++
+            packages: build-essential
+            cc_flags: -march=native
+
+          - name: Ubuntu 22.04 Clang
+            os: ubuntu-22.04
+            cc: clang
+            cxx: clang++
+            packages: clang
+            cc_flags: -march=native
+
+          - name: Ubuntu 24.04 GCC
+            os: ubuntu-24.04
+            cc: gcc
+            cxx: g++
+            packages: build-essential
+            cc_flags: -march=native
+
+          - name: Ubuntu 24.04 Clang
+            os: ubuntu-24.04
+            cc: clang
+            cxx: clang++
+            packages: clang
+            cc_flags: -march=native
+
+    env:
+      CC: ${{ matrix.cc }}
+      CXX: ${{ matrix.cxx }}
+      CC_FLAGS: ${{ matrix.cc_flags }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake expect netcat-openbsd ${{ matrix.packages }}
+
+      - name: Show tool versions
+        run: |
+          cmake --version
+          "${CC}" --version
+
+      - name: Configure
+        run: |
+          cmake \
+            -DCMAKE_C_FLAGS="-Werror ${CC_FLAGS}" \
+            -S platforms/posix \
+            -B platforms/posix/build
+
+      - name: Build
+        run: cmake --build platforms/posix/build
+
+      - name: Test
+        working-directory: platforms/posix/build
+        run: ctest -V
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/sobomax/microsippy.svg?branch=master)](https://travis-ci.com/sobomax/microsippy)
+[![CI](https://github.com/sobomax/microsippy/actions/workflows/main.yml/badge.svg)](https://github.com/sobomax/microsippy/actions/workflows/main.yml)
 
 # microsippy
 Extremely fast and lean, yet fully functional, SIP (RFC3261) and RTP (RFC3550)
diff --git a/platforms/posix/CMakeLists.txt b/platforms/posix/CMakeLists.txt
@@ -93,7 +93,10 @@ ENDIF (IS_BIG_ENDIAN)
 
 enable_testing()
 
-add_test(basic ${CMAKE_SOURCE_DIR}/../../scripts/do-test.sh ${CMAKE_SOURCE_DIR})
+add_test(NAME basic COMMAND
+  ${CMAKE_COMMAND} -E env BUILDDIR=${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/../../scripts/do-test.sh ${CMAKE_SOURCE_DIR}
+)
 add_test(NAME usipy_test_uac COMMAND usipy_test_uac)
 add_test(NAME usipy_test_ua COMMAND usipy_test_ua)
 
diff --git a/platforms/posix/scripts/test_start.sub b/platforms/posix/scripts/test_start.sub
@@ -1 +1,8 @@
-${BUILDDIR}/usipy_test 2>&1 | tee "${MLOG}" &
+MON_PIDFILE="${BUILDDIR}/usipy_test.pid"
+rm -f "${MON_PIDFILE}"
+(
+  "${BUILDDIR}/usipy_test" 2>&1 &
+  echo ${!} > "${MON_PIDFILE}"
+  wait ${!}
+) | tee "${MLOG}" &
+MON_PIPE_PID=${!}
diff --git a/platforms/posix/usipy_test_ua.c b/platforms/posix/usipy_test_ua.c
@@ -1,4 +1,5 @@
 #include <sys/socket.h>
+#include <arpa/inet.h>
 #include <netinet/in.h>
 #include <unistd.h>
 
@@ -41,9 +42,12 @@ bind_loopback_udp(void)
     sock = socket(AF_INET, SOCK_DGRAM, 0);
     assert(sock >= 0);
     sin.sin_family = AF_INET;
-    sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    assert(inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr) == 1);
     sin.sin_port = 0;
-    assert(bind(sock, (struct sockaddr *)&sin, sizeof(sin)) == 0);
+    if (bind(sock, (struct sockaddr *)&sin, sizeof(sin)) != 0) {
+        perror("bind_loopback_udp bind");
+        assert(0);
+    }
     return (sock);
 }
 
diff --git a/platforms/posix/usipy_test_uac.c b/platforms/posix/usipy_test_uac.c
@@ -1,4 +1,5 @@
 #include <sys/socket.h>
+#include <arpa/inet.h>
 #include <netinet/in.h>
 #include <unistd.h>
 
@@ -317,8 +318,11 @@ bind_loopback_udp(void)
     memset(&sin, '\0', sizeof(sin));
     sin.sin_family = AF_INET;
     sin.sin_port = htons(0);
-    sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    assert(bind(sock, (const struct sockaddr *)&sin, sizeof(sin)) == 0);
+    assert(inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr) == 1);
+    if (bind(sock, (const struct sockaddr *)&sin, sizeof(sin)) != 0) {
+        perror("bind_loopback_udp bind");
+        assert(0);
+    }
     return (sock);
 }
 
diff --git a/scripts/do-test.sh b/scripts/do-test.sh
@@ -10,6 +10,62 @@ TOOLSDIR=`dirname ${TOOLSPATH}`
 
 MLOG="${BUILDDIR}/monitor.log"
 TESTS="empty foobar 100trying ACK OPTIONS INVITE CANCEL 200OK"
+MON_PID=
+MON_PIPE_PID=
+
+cleanup()
+{
+  if [ ! -z "${MON_PID}" ]
+  then
+    kill -TERM "${MON_PID}" 2>/dev/null || true
+    wait "${MON_PID}" 2>/dev/null || true
+  fi
+  if [ ! -z "${MON_PIPE_PID}" ]
+  then
+    wait "${MON_PIPE_PID}" 2>/dev/null || true
+  fi
+}
+
+dump_failure_logs()
+{
+  echo "==== basic test failure diagnostics ===="
+  echo "SRCDIR=${SRCDIR}"
+  echo "BUILDDIR=${BUILDDIR}"
+  echo "BRD_IP=${BRD_IP}"
+  echo "MON_PID=${MON_PID}"
+  echo "MON_PIPE_PID=${MON_PIPE_PID}"
+  echo "---- loopback diagnostics ----"
+  cat /etc/hosts 2>/dev/null || true
+  getent hosts localhost 2>/dev/null || true
+  getent hosts 127.0.0.1 2>/dev/null || true
+  ip addr show lo 2>/dev/null || true
+  ip route get 127.0.0.1 2>/dev/null || true
+  ifconfig lo 2>/dev/null || true
+  ss -lunp 2>/dev/null || netstat -anu 2>/dev/null || true
+  python3 -c 'import socket; s=socket.socket(socket.AF_INET, socket.SOCK_DGRAM); s.bind(("127.0.0.1", 0)); print("python bind 127.0.0.1:0 ok", s.getsockname())' 2>&1 || true
+  echo "---- generated files ----"
+  ls -l "${BUILDDIR}"/*.req "${BUILDDIR}"/*.res "${BUILDDIR}"/*.res.pp 2>/dev/null || true
+  if [ -e "${MLOG}" ]
+  then
+    echo "---- ${MLOG} ----"
+    cat "${MLOG}"
+  else
+    echo "monitor log not found: ${MLOG}"
+  fi
+}
+
+finish()
+{
+  rc=${?}
+  set +e
+  if [ ${rc} -ne 0 ]
+  then
+    dump_failure_logs
+  fi
+  cleanup
+  exit ${rc}
+}
+trap finish EXIT
 
 if [ -e "${MLOG}" ]
 then
@@ -18,7 +74,17 @@ fi
 
 . "${SRCDIR}/scripts/test_start.sub"
 MON_RC=${?}
-MON_PID=${!}
+i=0
+while [ ${i} -lt 10 ] && [ ! -s "${MON_PIDFILE}" ]
+do
+  sleep 1
+  i=$((${i} + 1))
+done
+if [ ! -s "${MON_PIDFILE}" ]
+then
+  exit 1
+fi
+MON_PID=`cat "${MON_PIDFILE}"`
 
 . "${SRCDIR}/scripts/test_waitready.sub"
 
@@ -36,8 +102,6 @@ then
   done
   sleep 3
 fi
-kill -TERM ${MON_PID}
-wait ${MON_PID} || true
 if [ -z "${BRD_IP}" ]
 then
   exit 1
diff --git a/scripts/test.common.sub b/scripts/test.common.sub
@@ -17,5 +17,5 @@ then
   . "${SRCDIR}/scripts/test.common.sub"
 fi
 
-BUILDDIR="${SRCDIR}/build"
+BUILDDIR="${BUILDDIR:-${SRCDIR}/build}"
 DIFF="diff -u"
diff --git a/src/usipy_sip_udp_task.c b/src/usipy_sip_udp_task.c
@@ -26,6 +26,17 @@
 
 #define MAX_UDP_SIZE 1472 /* MTU 1500, no fragmentation */
 
+static uint16_t
+usipy_sip_udp_task_hton16(uint16_t hp)
+{
+
+#if USIPY_BIGENDIAN
+    return (hp);
+#else
+    return ((uint16_t)((hp << 8) | (hp >> 8)));
+#endif
+}
+
 #define TIME_HDR_PARSE(hm, to) do { \
         timer_opbegin(&ods); \
         rval = usipy_sip_msg_parse_hdrs(msg, hm, to); \
@@ -58,15 +69,15 @@ usipy_sip_udp_task(void *pvParameters)
         if (cfp->sip_af == AF_INET) {
             destAddr.v4.sin_addr.s_addr = htonl(INADDR_ANY);
             destAddr.v4.sin_family = AF_INET;
-            destAddr.v4.sin_port = htons(cfp->sip_port);
+            destAddr.v4.sin_port = usipy_sip_udp_task_hton16(cfp->sip_port);
             addr_family = AF_INET;
             ip_protocol = IPPROTO_IP;
             inet_ntop(AF_INET, &destAddr.v4.sin_addr, addr_str, sizeof(addr_str) - 1);
 	} else {
 #ifdef IPPROTO_IPV6
             bzero(&destAddr.v6.sin6_addr, sizeof(destAddr.v6.sin6_addr));
             destAddr.v6.sin6_family = AF_INET6;
-            destAddr.v6.sin6_port = htons(cfp->sip_port);
+            destAddr.v6.sin6_port = usipy_sip_udp_task_hton16(cfp->sip_port);
             addr_family = AF_INET6;
             ip_protocol = IPPROTO_IPV6;
             inet_ntop(AF_INET6, &destAddr.v6.sin6_addr, addr_str, sizeof(addr_str) - 1);
@@ -82,6 +93,7 @@ usipy_sip_udp_task(void *pvParameters)
             break;
         }
         USIPY_LOGI(cfp->log_tag, "Socket created");
+        USIPY_LOGI(cfp->log_tag, "Binding UDP port %u", cfp->sip_port);
 
         int err;
         if (cfp->sip_af == AF_INET) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![Build Status](https://travis-ci.com/sobomax/microsippy.svg?branch=master)](https://travis-ci.com/sobomax/microsippy)`
	`1`	`+[![CI](https://github.com/sobomax/microsippy/actions/workflows/main.yml/badge.svg)](https://github.com/sobomax/microsippy/actions/workflows/main.yml)`
`2`	`2`
`3`	`3`	`# microsippy`
`4`	`4`	`Extremely fast and lean, yet fully functional, SIP (RFC3261) and RTP (RFC3550)`