diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-04-13 18:40:10 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-04-13 18:40:10 +0000 |
| commit | 89f332a58b2759e15f48eaf83ce0242b705bfbdc (patch) | |
| tree | f1fcbf5198e76f90ad578d95eb6e9d3b6cb8b7ec /pjnath | |
| parent | a70d13251e3e30360fac5deeaccee1ba1b0d529e (diff) | |
More ticket #780: fixed compilation errors due to previous modifications related to TURN
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2591 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/include/pjnath/stun_msg.h | 2 | ||||
| -rw-r--r-- | pjnath/src/pjnath-test/server.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h index 25082626..cf183d02 100644 --- a/pjnath/include/pjnath/stun_msg.h +++ b/pjnath/include/pjnath/stun_msg.h @@ -1057,7 +1057,7 @@ typedef struct pj_stun_uint_attr pj_stun_req_transport_attr; * application data onward to the peer. This attribute has no value * part and thus the attribute length field is 0. */ -typedef struct pj_stun_empty_attr pj_stun_use_candidate_attr; +typedef struct pj_stun_empty_attr pj_stun_dont_fragment_attr; /** diff --git a/pjnath/src/pjnath-test/server.c b/pjnath/src/pjnath-test/server.c index aa044e9b..a5218a94 100644 --- a/pjnath/src/pjnath-test/server.c +++ b/pjnath/src/pjnath-test/server.c @@ -466,7 +466,7 @@ static pj_bool_t turn_on_data_recvfrom(pj_activesock_t *asock, goto send_pkt; } pj_stun_msg_add_sockaddr_attr(alloc->pool, alloc->data_ind, - PJ_STUN_ATTR_PEER_ADDR, PJ_TRUE, + PJ_STUN_ATTR_XOR_PEER_ADDR, PJ_TRUE, &alloc->alloc_addr, pj_sockaddr_get_len(&alloc->alloc_addr)); pj_stun_msg_add_binary_attr(alloc->pool, alloc->data_ind, @@ -515,13 +515,13 @@ static pj_bool_t turn_on_data_recvfrom(pj_activesock_t *asock, } else resp = create_success_response(test_srv, alloc, req, pool, 0, &auth_key); } else if (req->hdr.type == PJ_STUN_SEND_INDICATION) { - pj_stun_peer_addr_attr *pa; + pj_stun_xor_peer_addr_attr *pa; pj_stun_data_attr *da; test_srv->turn_stat.rx_send_ind_cnt++; - pa = (pj_stun_peer_addr_attr*) - pj_stun_msg_find_attr(req, PJ_STUN_ATTR_PEER_ADDR, 0); + pa = (pj_stun_xor_peer_addr_attr*) + pj_stun_msg_find_attr(req, PJ_STUN_ATTR_XOR_PEER_ADDR, 0); da = (pj_stun_data_attr*) pj_stun_msg_find_attr(req, PJ_STUN_ATTR_DATA, 0); if (pa && da) { @@ -588,7 +588,7 @@ static pj_bool_t alloc_on_data_recvfrom(pj_activesock_t *asock, pj_status_t status) { turn_allocation *alloc; - pj_stun_peer_addr_attr *pa; + pj_stun_xor_peer_addr_attr *pa; pj_stun_data_attr *da; char peer_info[PJ_INET6_ADDRSTRLEN+10]; char client_info[PJ_INET6_ADDRSTRLEN+10]; @@ -623,8 +623,8 @@ static pj_bool_t alloc_on_data_recvfrom(pj_activesock_t *asock, } /* Format a Data indication */ - pa = (pj_stun_peer_addr_attr*) - pj_stun_msg_find_attr(alloc->data_ind, PJ_STUN_ATTR_PEER_ADDR, 0); + pa = (pj_stun_xor_peer_addr_attr*) + pj_stun_msg_find_attr(alloc->data_ind, PJ_STUN_ATTR_XOR_PEER_ADDR, 0); da = (pj_stun_data_attr*) pj_stun_msg_find_attr(alloc->data_ind, PJ_STUN_ATTR_DATA, 0); pj_assert(pa && da); |