chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uds: disable the accidentally enabled announce timer. 

Commit e425da2f inadvertently enabled the announce timer on the UDS port,
causing it to continually reopen the socket when in slave mode. This patch
fixes the issue by passing zero in the 'span' field of the new function,
set_tmo_random, which disables the timer again.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Reported-by: Rohrer Hansjoerg <hj.rohrer@mobatime.com>
master
Richard Cochran 2014-01-08 18:52:36 +01:00
parent 21889c5e7e
commit f36af8e0c3
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ds.h
View File

@ -130,6 +130,7 @@ struct port_defaults {
UInteger8 announceReceiptTimeout; UInteger8 announceReceiptTimeout;
UInteger8 syncReceiptTimeout; UInteger8 syncReceiptTimeout;
UInteger8 transportSpecific; UInteger8 transportSpecific;
int announce_span;
int path_trace_enabled; int path_trace_enabled;
int follow_up_info; int follow_up_info;
int freq_est_interval; /*log seconds*/ int freq_est_interval; /*log seconds*/

3
port.c
View File

@ -843,7 +843,8 @@ static void port_nrate_initialize(struct port *p)
static int port_set_announce_tmo(struct port *p) static int port_set_announce_tmo(struct port *p)
{ {
return set_tmo_random(p->fda.fd[FD_ANNOUNCE_TIMER], return set_tmo_random(p->fda.fd[FD_ANNOUNCE_TIMER],
p->announceReceiptTimeout, 1, p->logAnnounceInterval); p->announceReceiptTimeout,
p->pod.announce_span, p->logAnnounceInterval);
} }
static int port_set_delay_tmo(struct port *p) static int port_set_delay_tmo(struct port *p)

1
ptp4l.c
View File

@ -84,6 +84,7 @@ static struct config cfg_settings = {
.announceReceiptTimeout = 3, .announceReceiptTimeout = 3,
.syncReceiptTimeout = 0, .syncReceiptTimeout = 0,
.transportSpecific = 0, .transportSpecific = 0,
.announce_span = 1,
.path_trace_enabled = 0, .path_trace_enabled = 0,
.follow_up_info = 0, .follow_up_info = 0,
.freq_est_interval = 1, .freq_est_interval = 1,