state-initializing: properly pre-set port number

The port number used to be 1, but we are multi-port, and forgot to update this item (no bad effects were seen so far, but the standard requires each port to use a different port number so loops can be managed, and, for example, having both Ethernet and UDP on the same wire is a loop. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

state-initializing: properly pre-set port number
The port number used to be 1, but we are multi-port, and forgot to update this item (no bad effects were seen so far, but the standard requires each port to use a different port number so loops can be managed, and, for example, having both Ethernet and UDP on the same wire is a loop. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
4c8ddedf · Alessandro Rubini · 63873358 · 4c8ddedf
Commit 4c8ddedf authored Sep 22, 2014 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

state-initializing.c proto-standard/state-initializing.c +2 -1

No files found.
--- a/proto-standard/state-initializing.c
+++ b/proto-standard/state-initializing.c
@@ -39,7 +39,8 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	 */
 	memcpy(&port->portIdentity.clockIdentity,
 		&DSDEF(ppi)->clockIdentity, PP_CLOCK_IDENTITY_LENGTH);
-	port->portIdentity.portNumber = 1;
+	/* 1-based port number =  index of this ppi in the global array */
+	port->portIdentity.portNumber = 1 + ppi - ppi->glbs->pp_instances;
 	port->logMinDelayReqInterval = PP_DEFAULT_DELAYREQ_INTERVAL;
 	port->logAnnounceInterval = opt->announce_intvl;
 	port->announceReceiptTimeout = PP_DEFAULT_ANNOUNCE_RECEIPT_TIMEOUT;