← Back to branch summary

~ubuntu-branches/debian/stretch/libnice/stretch

« back to all changes in this revision

Viewing changes to stun/usages/bind.c

Tags: 0.1.0-2
Add a Breaks: libgstfarsight0.10-0 (<< 0.22) for the gstreamer plugin as
farsight uses one libnice ABI and the gstreamer element uses another
libnice ABI things tend to go horribly wrong.

Show diffs side-by-side

added added

removed removed

Lines of Context:
stun/usages/bind.c
74
74
#include "timer.h"
75
75
 
76
76
 
 
77
#ifndef SOL_IP
 
78
# define SOL_IP IPPROTO_IP
 
79
#endif
 
80
 
 
81
#ifndef SOL_IPV6
 
82
# define SOL_IPV6 IPPROTO_IPV6
 
83
#endif
77
84
 
78
85
 
79
86
/** Non-blocking mode STUN binding discovery */
460
467
    return STUN_USAGE_BIND_RETURN_ERROR;
461
468
  }
462
469
 
463
 
  stun_timer_start (&timer);
 
470
  stun_timer_start (&timer, STUN_TIMER_DEFAULT_TIMEOUT,
 
471
      STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
464
472
  stun_debug ("STUN transaction started (timeout %dms).\n",
465
473
      stun_timer_remainder (&timer));
466
474
 
516
524
        if (val < -1)
517
525
          return STUN_USAGE_BIND_RETURN_ERROR;
518
526
 
519
 
        stun_timer_start (&timer);
 
527
        stun_timer_start (&timer, STUN_TIMER_DEFAULT_TIMEOUT,
 
528
            STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
520
529
        ret = STUN_USAGE_TRANS_RETURN_RETRY;
521
530
      } else if (bind_ret ==  STUN_USAGE_BIND_RETURN_INVALID) {
522
531
        ret = STUN_USAGE_TRANS_RETURN_RETRY;