diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-07-25 10:45:34 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-07-25 10:45:34 +0000 |
| commit | 2434bdddfe484d84c0fb9641875e8b9cbd2a22b0 (patch) | |
| tree | 0413caac1f14afb3f10e2622bfb40692d9ff388b /pjnath | |
| parent | 9d29e15eadae49726b4abc0b357eafe125145984 (diff) | |
Fixed linking errors in pjnath when TCP is disabled in PJLIB
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2177 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/src/pjnath/turn_sock.c | 5 | ||||
| -rw-r--r-- | pjnath/src/pjturn-srv/listener_tcp.c | 9 | ||||
| -rw-r--r-- | pjnath/src/pjturn-srv/main.c | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c index e595d271..94ff80ab 100644 --- a/pjnath/src/pjnath/turn_sock.c +++ b/pjnath/src/pjnath/turn_sock.c @@ -111,6 +111,7 @@ PJ_DEF(pj_status_t) pj_turn_sock_create(pj_stun_config *cfg, PJ_ASSERT_RETURN(cfg && p_turn_sock, PJ_EINVAL); PJ_ASSERT_RETURN(af==pj_AF_INET() || af==pj_AF_INET6(), PJ_EINVAL); PJ_ASSERT_RETURN(options==0, PJ_EINVAL); + PJ_ASSERT_RETURN(conn_type!=PJ_TURN_TP_TCP || PJ_HAS_TCP, PJ_EINVAL); switch (conn_type) { case PJ_TURN_TP_UDP: @@ -640,6 +641,7 @@ static void turn_on_state(pj_turn_session *sess, sizeof(addrtxt), 3))); /* Initiate non-blocking connect */ +#if PJ_HAS_TCP status=pj_activesock_start_connect(turn_sock->active_sock, turn_sock->pool, &info.server, @@ -650,6 +652,9 @@ static void turn_on_state(pj_turn_session *sess, pj_turn_sock_destroy(turn_sock); return; } +#else + on_connect_complete(turn_sock->active_sock, PJ_SUCCESS); +#endif /* Done for now. Subsequent work will be done in * on_connect_complete() callback. diff --git a/pjnath/src/pjturn-srv/listener_tcp.c b/pjnath/src/pjturn-srv/listener_tcp.c index e5369e5a..6d6fb33a 100644 --- a/pjnath/src/pjturn-srv/listener_tcp.c +++ b/pjnath/src/pjturn-srv/listener_tcp.c @@ -19,6 +19,8 @@ #include "turn.h" #include <pj/compat/socket.h> +#if PJ_HAS_TCP + struct accept_op { pj_ioqueue_op_key_t op_key; @@ -478,3 +480,10 @@ static void tcp_dec_ref(pj_turn_transport *tp, } } +#else /* PJ_HAS_TCP */ + +/* To avoid empty translation unit warning */ +int listener_tcp_dummy = 0; + +#endif /* PJ_HAS_TCP */ + diff --git a/pjnath/src/pjturn-srv/main.c b/pjnath/src/pjturn-srv/main.c index 77e13d9b..6b2e9d1e 100644 --- a/pjnath/src/pjturn-srv/main.c +++ b/pjnath/src/pjturn-srv/main.c @@ -146,10 +146,12 @@ int main() if (status != PJ_SUCCESS) return err("Error creating UDP listener", status); +#if PJ_HAS_TCP status = pj_turn_listener_create_tcp(srv, pj_AF_INET(), NULL, TURN_PORT, 1, 0, &listener); if (status != PJ_SUCCESS) return err("Error creating listener", status); +#endif status = pj_turn_srv_add_listener(srv, listener); if (status != PJ_SUCCESS) |