diff options
Diffstat (limited to 'pjsip')
-rw-r--r-- | pjsip/include/pjsip/sip_transport_tcp.h | 7 | ||||
-rw-r--r-- | pjsip/src/pjsip/sip_transport_tcp.c | 5 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 4 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/test.c | 6 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/transport_tcp_test.c | 7 |
5 files changed, 28 insertions, 1 deletions
diff --git a/pjsip/include/pjsip/sip_transport_tcp.h b/pjsip/include/pjsip/sip_transport_tcp.h index ff1af7a9..abadf171 100644 --- a/pjsip/include/pjsip/sip_transport_tcp.h +++ b/pjsip/include/pjsip/sip_transport_tcp.h @@ -26,6 +26,11 @@ #include <pjsip/sip_transport.h> + +/* Only declare the API if PJ_HAS_TCP is true */ +#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0 + + PJ_BEGIN_DECL /** @@ -112,4 +117,6 @@ PJ_END_DECL * @} */ +#endif /* PJ_HAS_TCP */ + #endif /* __PJSIP_TRANSPORT_TCP_H__ */ diff --git a/pjsip/src/pjsip/sip_transport_tcp.c b/pjsip/src/pjsip/sip_transport_tcp.c index 481387c0..6033a8d3 100644 --- a/pjsip/src/pjsip/sip_transport_tcp.c +++ b/pjsip/src/pjsip/sip_transport_tcp.c @@ -29,6 +29,9 @@ #include <pj/pool.h> #include <pj/string.h> +/* Only declare the API if PJ_HAS_TCP is true */ +#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0 + #define THIS_FILE "sip_transport_tcp.c" @@ -1365,3 +1368,5 @@ static void on_connect_complete(pj_ioqueue_key_t *key, tcp_flush_pending_tx(tcp); } +#endif /* PJ_HAS_TCP */ + diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index e40882d5..136364ff 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -1191,6 +1191,8 @@ PJ_DEF(pj_status_t) pjsua_transport_create( pjsip_transport_type_e type, pjsua_var.tpdata[id].local_name = tp->local_name; pjsua_var.tpdata[id].data.tp = tp; +#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0 + } else if (type == PJSIP_TRANSPORT_TCP) { /* * Create TCP transport. @@ -1242,6 +1244,8 @@ PJ_DEF(pj_status_t) pjsua_transport_create( pjsip_transport_type_e type, pjsua_var.tpdata[id].local_name = tcp->addr_name; pjsua_var.tpdata[id].data.factory = tcp; +#endif /* PJ_HAS_TCP */ + #if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0 } else if (type == PJSIP_TRANSPORT_TLS) { /* diff --git a/pjsip/src/test-pjsip/test.c b/pjsip/src/test-pjsip/test.c index 62360756..62e3aed3 100644 --- a/pjsip/src/test-pjsip/test.c +++ b/pjsip/src/test-pjsip/test.c @@ -226,8 +226,10 @@ int test_main(void) #if INCLUDE_TSX_TEST unsigned i; pjsip_transport *tp; +#if PJ_HAS_TCP pjsip_tpfactory *tpfactory; -#endif +#endif /* PJ_HAS_TCP */ +#endif /* INCLUDE_TSX_TEST */ int line; pj_log_set_level(log_level); @@ -331,6 +333,7 @@ int test_main(void) ++tsx_test_cnt; } +#if PJ_HAS_TCP status = pjsip_tcp_transport_start(endpt, NULL, 1, &tpfactory); if (status == PJ_SUCCESS) { tsx_test[tsx_test_cnt].port = tpfactory->addr_name.port; @@ -342,6 +345,7 @@ int test_main(void) rc = -4; goto on_return; } +#endif for (i=0; i<tsx_test_cnt; ++i) { diff --git a/pjsip/src/test-pjsip/transport_tcp_test.c b/pjsip/src/test-pjsip/transport_tcp_test.c index 1835f1d5..50b59afe 100644 --- a/pjsip/src/test-pjsip/transport_tcp_test.c +++ b/pjsip/src/test-pjsip/transport_tcp_test.c @@ -27,6 +27,7 @@ /* * TCP transport test. */ +#if PJ_HAS_TCP int transport_tcp_test(void) { enum { SEND_RECV_LOOP = 8 }; @@ -141,3 +142,9 @@ int transport_tcp_test(void) /* Done */ return 0; } +#else /* PJ_HAS_TCP */ +int transport_tcp_test(void) +{ + return 0; +} +#endif /* PJ_HAS_TCP */ |