From 007033330a361bbfb9fd9d9a7acba9cecb9e0369 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Tue, 22 Nov 2022 17:16:31 +0900 Subject: [PATCH] Fixed test code for MacOSX Ventura --- tests/sctp/sctp-test.c | 26 +++----------------------- tests/unit/gtp-message-test.c | 4 ++-- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/tests/sctp/sctp-test.c b/tests/sctp/sctp-test.c index 1ac33b801..ff24ab1df 100644 --- a/tests/sctp/sctp-test.c +++ b/tests/sctp/sctp-test.c @@ -82,9 +82,7 @@ static void test2_main(void *data) size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); -#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */ ABTS_INT_EQUAL(tc, PPID, sinfo.ppid); -#endif ogs_sctp_destroy(sctp); rv = ogs_freeaddrinfo(addr); @@ -171,9 +169,7 @@ static void test3_func(abts_case *tc, void *data) size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); -#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */ ABTS_INT_EQUAL(tc, PPID, sinfo.ppid); -#endif ogs_thread_destroy(test3_thread); @@ -204,9 +200,7 @@ static void test4_main(void *data) size = ogs_sctp_recvdata(sctp, str, STRLEN, NULL, &sinfo); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); -#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */ ABTS_INT_EQUAL(tc, PPID, sinfo.ppid); -#endif ogs_sctp_destroy(sctp); @@ -235,9 +229,7 @@ static void test4_func(abts_case *tc, void *data) size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf)); -#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */ ABTS_INT_EQUAL(tc, PPID, sinfo.ppid); -#endif size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), &from, PPID, 0); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); @@ -273,26 +265,16 @@ static void test5_main(void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); rv = ogs_sctp_connect(sctp, addr); ABTS_INT_EQUAL(tc, OGS_OK, rv); + size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), addr, PPID, 0); + ABTS_INT_EQUAL(tc, strlen(DATASTR), size); + rv = ogs_freeaddrinfo(addr); ABTS_INT_EQUAL(tc, OGS_OK, rv); -#if !HAVE_USRSCTP /* FIXME : libusrsctp 0.9.3.0 does not support remote_addr */ - remote_addr = &sctp->remote_addr; - ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(remote_addr, buf)); - - size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), - remote_addr, PPID, 0); -#else - size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), - addr, PPID, 0); -#endif - ABTS_INT_EQUAL(tc, strlen(DATASTR), size); size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf)); -#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */ ABTS_INT_EQUAL(tc, PPID, sinfo.ppid); -#endif ogs_sctp_destroy(sctp); } @@ -320,9 +302,7 @@ static void test5_func(abts_case *tc, void *data) size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo); ABTS_INT_EQUAL(tc, strlen(DATASTR), size); ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf)); -#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */ ABTS_INT_EQUAL(tc, PPID, sinfo.ppid); -#endif size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), &from, sinfo.ppid, 0); diff --git a/tests/unit/gtp-message-test.c b/tests/unit/gtp-message-test.c index b5866f698..404fa79c2 100644 --- a/tests/unit/gtp-message-test.c +++ b/tests/unit/gtp-message-test.c @@ -191,8 +191,6 @@ static void gtp_message_test1(abts_case *tc, void *data) pkbuf, OGS_TLV_MODE_T1_L2_I1); ABTS_INT_EQUAL(tc, OGS_OK, rv); - ogs_pkbuf_free(pkbuf); - ABTS_INT_EQUAL(tc, 1, req.imsi.presence); ABTS_INT_EQUAL(tc, 8, req.imsi.len); _value = (char*)"55153011 340010f4"; @@ -310,6 +308,8 @@ static void gtp_message_test1(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, 0, req.epdg_ldn.presence); ABTS_INT_EQUAL(tc, 0, req.mo_exception_data_counter.presence); ABTS_INT_EQUAL(tc, 0, req.ue_tcp_port.presence); + + ogs_pkbuf_free(pkbuf); } abts_suite *test_gtp_message(abts_suite *suite)