Changeset 4407
- Timestamp:
- Feb 27, 2013 3:02:03 PM (12 years ago)
- Location:
- pjproject/branches/1.x
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/1.x
- Property svn:mergeinfo changed
/pjproject/trunk merged: 4352
- Property svn:mergeinfo changed
-
pjproject/branches/1.x/pjnath/include/pjnath/stun_session.h
r3553 r4407 683 683 * @param sess The STUN session instance. 684 684 * @param tdata The request message previously sent. 685 * @param mod_count Boolean flag to indicate whether transmission count 686 * needs to be incremented. 685 687 * 686 688 * @return PJ_SUCCESS on success, or the appropriate error. … … 690 692 */ 691 693 PJ_DECL(pj_status_t) pj_stun_session_retransmit_req(pj_stun_session *sess, 692 pj_stun_tx_data *tdata); 694 pj_stun_tx_data *tdata, 695 pj_bool_t mod_count); 693 696 694 697 -
pjproject/branches/1.x/pjnath/include/pjnath/stun_transaction.h
r3553 r4407 235 235 * 236 236 * @param tsx The STUN client transaction instance. 237 * @param mod_count Boolean flag to indicate whether transmission count 238 * needs to be incremented. 237 239 * 238 240 * @return PJ_SUCCESS on success, or PJNATH_ESTUNDESTROYED … … 241 243 * as returned by \a on_send_msg() callback. 242 244 */ 243 PJ_DECL(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx); 245 PJ_DECL(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx, 246 pj_bool_t mod_count); 244 247 245 248 -
pjproject/branches/1.x/pjnath/src/pjnath/ice_session.c
r3951 r4407 2710 2710 LOG5((ice->obj_name, "Triggered check for check %d not performed " 2711 2711 "because it's in progress. Retransmitting", i)); 2712 pj_stun_session_retransmit_req(comp->stun_sess, c->tdata );2712 pj_stun_session_retransmit_req(comp->stun_sess, c->tdata, PJ_FALSE); 2713 2713 2714 2714 } else if (c->state == PJ_ICE_SESS_CHECK_STATE_SUCCEEDED) { -
pjproject/branches/1.x/pjnath/src/pjnath/stun_session.c
r3876 r4407 1053 1053 */ 1054 1054 PJ_DEF(pj_status_t) pj_stun_session_retransmit_req(pj_stun_session *sess, 1055 pj_stun_tx_data *tdata) 1055 pj_stun_tx_data *tdata, 1056 pj_bool_t mod_count) 1056 1057 { 1057 1058 pj_status_t status; … … 1064 1065 pj_lock_acquire(sess->lock); 1065 1066 1066 status = pj_stun_client_tsx_retransmit(tdata->client_tsx );1067 status = pj_stun_client_tsx_retransmit(tdata->client_tsx, mod_count); 1067 1068 1068 1069 pj_lock_release(sess->lock); -
pjproject/branches/1.x/pjnath/src/pjnath/stun_transaction.c
r3553 r4407 181 181 * Transmit message. 182 182 */ 183 static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx) 183 static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx, 184 pj_bool_t mod_count) 184 185 { 185 186 pj_status_t status; … … 188 189 !tsx->require_retransmit, PJ_EBUSY); 189 190 190 if (tsx->require_retransmit ) {191 if (tsx->require_retransmit && mod_count) { 191 192 /* Calculate retransmit/timeout delay */ 192 193 if (tsx->transmit_count == 0) { … … 222 223 223 224 224 tsx->transmit_count++; 225 if (mod_count) 226 tsx->transmit_count++; 225 227 226 228 PJ_LOG(5,(tsx->obj_name, "STUN sending message (transmit count=%d)", … … 233 235 /* We've been destroyed, don't access the object. */ 234 236 } else if (status != PJ_SUCCESS) { 235 if (tsx->retransmit_timer.id != 0 ) {237 if (tsx->retransmit_timer.id != 0 && mod_count) { 236 238 pj_timer_heap_cancel(tsx->timer_heap, 237 239 &tsx->retransmit_timer); … … 295 297 296 298 /* Send the message */ 297 status = tsx_transmit_msg(tsx );299 status = tsx_transmit_msg(tsx, PJ_TRUE); 298 300 if (status != PJ_SUCCESS) { 299 301 if (tsx->retransmit_timer.id != 0) { … … 333 335 334 336 tsx->retransmit_timer.id = 0; 335 status = tsx_transmit_msg(tsx );337 status = tsx_transmit_msg(tsx, PJ_TRUE); 336 338 if (status == PJNATH_ESTUNDESTROYED) { 337 339 /* We've been destroyed, don't try to access the object */ … … 351 353 * Request to retransmit the request. 352 354 */ 353 PJ_DEF(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx) 355 PJ_DEF(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx, 356 pj_bool_t mod_count) 354 357 { 355 358 if (tsx->destroy_timer.id != 0) { … … 362 365 } 363 366 364 return tsx_transmit_msg(tsx );367 return tsx_transmit_msg(tsx, mod_count); 365 368 } 366 369
Note: See TracChangeset
for help on using the changeset viewer.