mirror of
				https://github.com/open5gs/open5gs.git
				synced 2025-11-04 05:53:18 +00:00 
			
		
		
		
	Fixed test code for MacOSX Ventura
This commit is contained in:
		@@ -82,9 +82,7 @@ static void test2_main(void *data)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
 | 
					    size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
					    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ogs_sctp_destroy(sctp);
 | 
					    ogs_sctp_destroy(sctp);
 | 
				
			||||||
    rv = ogs_freeaddrinfo(addr);
 | 
					    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);
 | 
					    size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
					    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    ogs_thread_destroy(test3_thread);
 | 
					    ogs_thread_destroy(test3_thread);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -204,9 +200,7 @@ static void test4_main(void *data)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    size = ogs_sctp_recvdata(sctp, str, STRLEN, NULL, &sinfo);
 | 
					    size = ogs_sctp_recvdata(sctp, str, STRLEN, NULL, &sinfo);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
					    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ogs_sctp_destroy(sctp);
 | 
					    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);
 | 
					    size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
    ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf));
 | 
					    ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf));
 | 
				
			||||||
#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
					    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), &from, PPID, 0);
 | 
					    size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), &from, PPID, 0);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
@@ -273,26 +265,16 @@ static void test5_main(void *data)
 | 
				
			|||||||
    ABTS_INT_EQUAL(tc, OGS_OK, rv);
 | 
					    ABTS_INT_EQUAL(tc, OGS_OK, rv);
 | 
				
			||||||
    rv = ogs_sctp_connect(sctp, addr);
 | 
					    rv = ogs_sctp_connect(sctp, addr);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, OGS_OK, rv);
 | 
					    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);
 | 
					    rv = ogs_freeaddrinfo(addr);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, OGS_OK, rv);
 | 
					    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);
 | 
					    size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
    ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf));
 | 
					    ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf));
 | 
				
			||||||
#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
					    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ogs_sctp_destroy(sctp);
 | 
					    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);
 | 
					    size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
					    ABTS_INT_EQUAL(tc, strlen(DATASTR), size);
 | 
				
			||||||
    ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf));
 | 
					    ABTS_STR_EQUAL(tc, "::1", OGS_ADDR(&from, buf));
 | 
				
			||||||
#if !HAVE_USRSCTP /* FIXME : USRSCTP is not working */
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
					    ABTS_INT_EQUAL(tc, PPID, sinfo.ppid);
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), &from,
 | 
					    size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), &from,
 | 
				
			||||||
            sinfo.ppid, 0);
 | 
					            sinfo.ppid, 0);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -191,8 +191,6 @@ static void gtp_message_test1(abts_case *tc, void *data)
 | 
				
			|||||||
            pkbuf, OGS_TLV_MODE_T1_L2_I1);
 | 
					            pkbuf, OGS_TLV_MODE_T1_L2_I1);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, OGS_OK, rv);
 | 
					    ABTS_INT_EQUAL(tc, OGS_OK, rv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ogs_pkbuf_free(pkbuf);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    ABTS_INT_EQUAL(tc, 1, req.imsi.presence);
 | 
					    ABTS_INT_EQUAL(tc, 1, req.imsi.presence);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, 8, req.imsi.len);
 | 
					    ABTS_INT_EQUAL(tc, 8, req.imsi.len);
 | 
				
			||||||
    _value = (char*)"55153011 340010f4";
 | 
					    _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.epdg_ldn.presence);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, 0, req.mo_exception_data_counter.presence);
 | 
					    ABTS_INT_EQUAL(tc, 0, req.mo_exception_data_counter.presence);
 | 
				
			||||||
    ABTS_INT_EQUAL(tc, 0, req.ue_tcp_port.presence);
 | 
					    ABTS_INT_EQUAL(tc, 0, req.ue_tcp_port.presence);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ogs_pkbuf_free(pkbuf);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
abts_suite *test_gtp_message(abts_suite *suite)
 | 
					abts_suite *test_gtp_message(abts_suite *suite)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user