From 25c436a6432ebac429285c81f990653a4c52dd3c Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sun, 18 Mar 2007 17:39:27 +0000 Subject: Changed pj_sockaddr structure and added pjnath project for ICE/STUN stuffs git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1080 74dad513-b988-da41-8d7b-12977e46ad98 --- pjnath/src/pjstun-srv-test/bind_usage.c | 2 +- pjnath/src/pjstun-srv-test/server.c | 6 +++--- pjnath/src/pjstun-srv-test/server.h | 3 ++- pjnath/src/pjstun-srv-test/turn_usage.c | 10 ++++++---- 4 files changed, 12 insertions(+), 9 deletions(-) (limited to 'pjnath/src/pjstun-srv-test') diff --git a/pjnath/src/pjstun-srv-test/bind_usage.c b/pjnath/src/pjstun-srv-test/bind_usage.c index fc10fb91..3c1825f9 100644 --- a/pjnath/src/pjstun-srv-test/bind_usage.c +++ b/pjnath/src/pjstun-srv-test/bind_usage.c @@ -85,7 +85,7 @@ PJ_DEF(pj_status_t) pj_stun_bind_usage_create(pj_stun_server *srv, pj_bzero(&sess_cb, sizeof(sess_cb)); sess_cb.on_send_msg = &sess_on_send_msg; sess_cb.on_rx_request = &sess_on_rx_request; - status = pj_stun_session_create(si->endpt, "bind%p", &sess_cb, PJ_FALSE, + status = pj_stun_session_create(si->cfg, "bind%p", &sess_cb, PJ_FALSE, &bu->session); if (status != PJ_SUCCESS) { pj_stun_usage_destroy(bu->usage); diff --git a/pjnath/src/pjstun-srv-test/server.c b/pjnath/src/pjstun-srv-test/server.c index 5fdb233e..d0fe426d 100644 --- a/pjnath/src/pjstun-srv-test/server.c +++ b/pjnath/src/pjstun-srv-test/server.c @@ -83,8 +83,8 @@ PJ_DEF(pj_status_t) pj_stun_server_create(pj_pool_factory *pf, if (status != PJ_SUCCESS) goto on_error; - status = pj_stun_endpoint_create(srv->si.pf, 0, srv->si.ioqueue, - srv->si.timer_heap, &srv->si.endpt); + status = pj_stun_config_create(srv->si.pf, 0, srv->si.ioqueue, + srv->si.timer_heap, &srv->si.cfg); if (status != PJ_SUCCESS) goto on_error; @@ -174,7 +174,7 @@ PJ_DEF(pj_status_t) pj_stun_server_destroy(pj_stun_server *srv) srv->threads[i] = NULL; } - pj_stun_endpoint_destroy(srv->si.endpt); + pj_stun_config_destroy(srv->si.cfg); pj_timer_heap_destroy(srv->si.timer_heap); pj_ioqueue_destroy(srv->si.ioqueue); pj_pool_release(srv->pool); diff --git a/pjnath/src/pjstun-srv-test/server.h b/pjnath/src/pjstun-srv-test/server.h index a88d87c2..6c61da39 100644 --- a/pjnath/src/pjstun-srv-test/server.h +++ b/pjnath/src/pjstun-srv-test/server.h @@ -19,6 +19,7 @@ #ifndef __STUN_SERVER_H__ #define __STUN_SERVER_H__ +#include #include #include @@ -30,7 +31,7 @@ typedef struct pj_stun_server pj_stun_server; typedef struct pj_stun_server_info { pj_pool_factory *pf; - pj_stun_endpoint *endpt; + pj_stun_config *cfg; pj_ioqueue_t *ioqueue; pj_timer_heap_t *timer_heap; unsigned thread_cnt; diff --git a/pjnath/src/pjstun-srv-test/turn_usage.c b/pjnath/src/pjstun-srv-test/turn_usage.c index e3d2e595..c1f83d15 100644 --- a/pjnath/src/pjstun-srv-test/turn_usage.c +++ b/pjnath/src/pjstun-srv-test/turn_usage.c @@ -69,7 +69,7 @@ static pj_status_t client_handle_stun_msg(struct turn_client *client, struct turn_usage { pj_pool_factory *pf; - pj_stun_endpoint *endpt; + pj_stun_config *cfg; pj_ioqueue_t *ioqueue; pj_timer_heap_t *timer_heap; pj_pool_t *pool; @@ -165,7 +165,7 @@ PJ_DEF(pj_status_t) pj_stun_turn_usage_create(pj_stun_server *srv, tu->pool = pool; tu->type = type; tu->pf = si->pf; - tu->endpt = si->endpt; + tu->cfg = si->cfg; tu->ioqueue = si->ioqueue; tu->timer_heap = si->timer_heap; tu->next_port = START_PORT; @@ -197,7 +197,7 @@ PJ_DEF(pj_status_t) pj_stun_turn_usage_create(pj_stun_server *srv, pj_bzero(&sess_cb, sizeof(sess_cb)); sess_cb.on_send_msg = &tu_sess_on_send_msg; sess_cb.on_rx_request = &tu_sess_on_rx_request; - status = pj_stun_session_create(si->endpt, "turns%p", &sess_cb, PJ_FALSE, + status = pj_stun_session_create(si->cfg, "turns%p", &sess_cb, PJ_FALSE, &tu->default_session); if (status != PJ_SUCCESS) { pj_stun_usage_destroy(tu->usage); @@ -208,6 +208,8 @@ PJ_DEF(pj_status_t) pj_stun_turn_usage_create(pj_stun_server *srv, sd->tu = tu; pj_stun_session_set_user_data(tu->default_session, sd); + pj_stun_session_set_server_name(tu->default_session, NULL); + /* Create mutex */ status = pj_mutex_create_recursive(pool, "turn%p", &tu->mutex); if (status != PJ_SUCCESS) { @@ -620,7 +622,7 @@ static pj_status_t client_create(struct turn_usage *tu, sess_cb.on_send_msg = &client_sess_on_send_msg; sess_cb.on_rx_request = &client_sess_on_rx_msg; sess_cb.on_rx_indication = &client_sess_on_rx_msg; - status = pj_stun_session_create(tu->endpt, client->obj_name, + status = pj_stun_session_create(tu->cfg, client->obj_name, &sess_cb, PJ_FALSE, &client->session); if (status != PJ_SUCCESS) { -- cgit v1.2.3