diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-03-21 09:31:01 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-03-21 09:31:01 +0000 |
commit | 191eab5e65e06a3ca03bf81e05aa8522253f9267 (patch) | |
tree | b0277a5baa61b82b9da0bb56acea83904a67e63e /pjnath/src/pjstun-srv-test | |
parent | 6d9b32c4a8e1dfdb5809c6e1035ddfdda848a128 (diff) |
s/stun_setting/stun_config
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1091 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath/src/pjstun-srv-test')
-rw-r--r-- | pjnath/src/pjstun-srv-test/bind_usage.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/server.c | 7 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/server.h | 2 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/turn_usage.c | 24 |
4 files changed, 17 insertions, 20 deletions
diff --git a/pjnath/src/pjstun-srv-test/bind_usage.c b/pjnath/src/pjstun-srv-test/bind_usage.c index 3c1825f9..680dd5c0 100644 --- a/pjnath/src/pjstun-srv-test/bind_usage.c +++ b/pjnath/src/pjstun-srv-test/bind_usage.c @@ -85,8 +85,8 @@ 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->cfg, "bind%p", &sess_cb, PJ_FALSE, - &bu->session); + status = pj_stun_session_create(&si->stun_cfg, "bind%p", &sess_cb, + PJ_FALSE, &bu->session); if (status != PJ_SUCCESS) { pj_stun_usage_destroy(bu->usage); return status; diff --git a/pjnath/src/pjstun-srv-test/server.c b/pjnath/src/pjstun-srv-test/server.c index d0fe426d..eb1e12b0 100644 --- a/pjnath/src/pjstun-srv-test/server.c +++ b/pjnath/src/pjstun-srv-test/server.c @@ -83,10 +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_config_create(srv->si.pf, 0, srv->si.ioqueue, - srv->si.timer_heap, &srv->si.cfg); - if (status != PJ_SUCCESS) - goto on_error; + pj_stun_config_init(&srv->si.stun_cfg, srv->si.pf, 0, srv->si.ioqueue, + srv->si.timer_heap); srv->si.thread_cnt = thread_cnt; srv->threads = pj_pool_calloc(pool, thread_cnt, sizeof(pj_thread_t*)); @@ -174,7 +172,6 @@ PJ_DEF(pj_status_t) pj_stun_server_destroy(pj_stun_server *srv) srv->threads[i] = NULL; } - 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 6c61da39..633131c6 100644 --- a/pjnath/src/pjstun-srv-test/server.h +++ b/pjnath/src/pjstun-srv-test/server.h @@ -31,7 +31,7 @@ typedef struct pj_stun_server pj_stun_server; typedef struct pj_stun_server_info { pj_pool_factory *pf; - pj_stun_config *cfg; + pj_stun_config stun_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 c1f83d15..d5677f9e 100644 --- a/pjnath/src/pjstun-srv-test/turn_usage.c +++ b/pjnath/src/pjstun-srv-test/turn_usage.c @@ -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->cfg = si->cfg; + tu->cfg = &si->stun_cfg; tu->ioqueue = si->ioqueue; tu->timer_heap = si->timer_heap; tu->next_port = START_PORT; @@ -197,8 +197,8 @@ 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->cfg, "turns%p", &sess_cb, PJ_FALSE, - &tu->default_session); + status = pj_stun_session_create(&si->stun_cfg, "turns%p", &sess_cb, + PJ_FALSE, &tu->default_session); if (status != PJ_SUCCESS) { pj_stun_usage_destroy(tu->usage); return status; @@ -933,13 +933,13 @@ static pj_status_t client_handle_allocate_req(struct turn_client *client, } /* Process REQUESTED-IP attribute */ - if (a_rip && a_rip->addr.addr.sa_family != PJ_AF_INET) { + if (a_rip && a_rip->sockaddr.addr.sa_family != PJ_AF_INET) { client_respond(client, msg, PJ_STUN_SC_INVALID_IP_ADDR, NULL, src_addr, src_addr_len); return PJ_SUCCESS; } else if (a_rip) { - req_addr.sin_addr.s_addr = a_rip->addr.ipv4.sin_addr.s_addr; + req_addr.sin_addr.s_addr = a_rip->sockaddr.ipv4.sin_addr.s_addr; } /* Process REQUESTED-PORT-PROPS attribute */ @@ -1106,7 +1106,7 @@ static pj_status_t client_handle_sad(struct turn_client *client, /* Remote active destination needs to be cleared */ client->active_peer = NULL; - } else if (a_raddr->addr.addr.sa_family != PJ_AF_INET) { + } else if (a_raddr->sockaddr.addr.sa_family != PJ_AF_INET) { /* Bad request (not IPv4) */ client_respond(client, msg, PJ_STUN_SC_BAD_REQUEST, NULL, src_addr, src_addr_len); @@ -1125,9 +1125,9 @@ static pj_status_t client_handle_sad(struct turn_client *client, pj_uint32_t hval = 0; /* Add a new peer/permission if we don't have one for this address */ - peer = client_get_peer(client, &a_raddr->addr.ipv4, &hval); + peer = client_get_peer(client, &a_raddr->sockaddr.ipv4, &hval); if (peer==NULL) { - peer = client_add_peer(client, &a_raddr->addr.ipv4, hval); + peer = client_add_peer(client, &a_raddr->sockaddr.ipv4, hval); } /* Set active destination */ @@ -1172,7 +1172,7 @@ static pj_status_t client_handle_send_ind(struct turn_client *client, /* REMOTE-ADDRESS not present, discard packet */ return PJ_SUCCESS; - } else if (a_raddr->addr.addr.sa_family != PJ_AF_INET) { + } else if (a_raddr->sockaddr.addr.sa_family != PJ_AF_INET) { /* REMOTE-ADDRESS present but not IPv4, discard packet */ return PJ_SUCCESS; @@ -1195,13 +1195,13 @@ static pj_status_t client_handle_send_ind(struct turn_client *client, } /* Add to peer table if necessary */ - if (client_get_peer(client, &a_raddr->addr.ipv4, &hval)==NULL) - client_add_peer(client, &a_raddr->addr.ipv4, hval); + if (client_get_peer(client, &a_raddr->sockaddr.ipv4, &hval)==NULL) + client_add_peer(client, &a_raddr->sockaddr.ipv4, hval); /* Send the packet */ pj_ioqueue_sendto(client->key, &client->pkt_write_key, data, &datalen, 0, - &a_raddr->addr.ipv4, sizeof(a_raddr->addr.ipv4)); + &a_raddr->sockaddr.ipv4, sizeof(pj_sockaddr_in)); return PJ_SUCCESS; } |