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

port: Separate unicast specific code from port_signaling_construct() 

Make port_signaling_construct() to create a generic signaling
ptp_message. Move the unicast specific code to
port_signaling_uc_construct().

This is done to support the creation of Message Interval Request TLV (as
defined in 802.1AS Section 10.5.4.3). This TLV can be used to request
change in Announce Interval, Sync Interval or Link Delay Interval on a
remote system.

[ RC - fix trivial rebase conflict on top of targetPortIdentity check. ]

Signed-off-by: Vedang Patel <vedang.patel@intel.com>
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Vedang Patel 2019-03-28 20:32:26 -07:00 committed by Richard Cochran
parent 705e5a32fa
commit 43085ab741
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
port_private.h
View File

@ -169,7 +169,7 @@ int port_set_delay_tmo(struct port *p);
int port_set_qualification_tmo(struct port *p); int port_set_qualification_tmo(struct port *p);
void port_show_transition(struct port *p, enum port_state next, void port_show_transition(struct port *p, enum port_state next,
enum fsm_event event); enum fsm_event event);
struct ptp_message *port_signaling_construct(struct port *p, struct ptp_message *port_signaling_uc_construct(struct port *p,
struct address *address, struct address *address,
struct PortIdentity *tpid); struct PortIdentity *tpid);
int port_tx_announce(struct port *p, struct address *dst); int port_tx_announce(struct port *p, struct address *dst);

18
port_signaling.c
View File

@ -28,8 +28,7 @@ static struct PortIdentity wildcard = {
.portNumber = 0xffff, .portNumber = 0xffff,
}; };
struct ptp_message *port_signaling_construct(struct port *p, static struct ptp_message *port_signaling_construct(struct port *p,
struct address *address,
struct PortIdentity *tpid) struct PortIdentity *tpid)
{ {
struct ptp_message *msg; struct ptp_message *msg;
@ -48,6 +47,21 @@ struct ptp_message *port_signaling_construct(struct port *p,
msg->header.control = CTL_OTHER; msg->header.control = CTL_OTHER;
msg->header.logMessageInterval = 0x7F; msg->header.logMessageInterval = 0x7F;
msg->signaling.targetPortIdentity = *tpid; msg->signaling.targetPortIdentity = *tpid;
return msg;
}
struct ptp_message *port_signaling_uc_construct(struct port *p,
struct address *address,
struct PortIdentity *tpid)
{
struct ptp_message *msg;
msg = port_signaling_construct(p, tpid);
if (!msg) {
return NULL;
}
msg->header.flagField[0] |= UNICAST; msg->header.flagField[0] |= UNICAST;
msg->address = *address; msg->address = *address;

10
unicast_client.c
View File

@ -68,7 +68,7 @@ static int unicast_client_announce(struct port *p,
struct ptp_message *msg; struct ptp_message *msg;
int err; int err;
msg = port_signaling_construct(p, &dst->address, &dst->portIdentity); msg = port_signaling_uc_construct(p, &dst->address, &dst->portIdentity);
if (!msg) { if (!msg) {
return -1; return -1;
} }
@ -129,7 +129,7 @@ static int unicast_client_peer_renew(struct port *p)
peer->renewal_tmo = 0; peer->renewal_tmo = 0;
pr_debug("port %d: time to renew P2P unicast subscription", portnum(p)); pr_debug("port %d: time to renew P2P unicast subscription", portnum(p));
msg = port_signaling_construct(p, &peer->address, &peer->portIdentity); msg = port_signaling_uc_construct(p, &peer->address, &peer->portIdentity);
if (!msg) { if (!msg) {
return -1; return -1;
} }
@ -165,7 +165,7 @@ static int unicast_client_renew(struct port *p,
dst->renewal_tmo = 0; dst->renewal_tmo = 0;
pr_debug("port %d: time to renew unicast subscriptions", portnum(p)); pr_debug("port %d: time to renew unicast subscriptions", portnum(p));
msg = port_signaling_construct(p, &dst->address, &dst->portIdentity); msg = port_signaling_uc_construct(p, &dst->address, &dst->portIdentity);
if (!msg) { if (!msg) {
return -1; return -1;
} }
@ -225,7 +225,7 @@ static int unicast_client_sydy(struct port *p,
struct ptp_message *msg; struct ptp_message *msg;
int err; int err;
msg = port_signaling_construct(p, &dst->address, &dst->portIdentity); msg = port_signaling_uc_construct(p, &dst->address, &dst->portIdentity);
if (!msg) { if (!msg) {
return -1; return -1;
} }
@ -285,7 +285,7 @@ int unicast_client_cancel(struct port *p, struct ptp_message *m,
ucma->granted &= ~(1 << mtype); ucma->granted &= ~(1 << mtype);
/* Respond with ACK. */ /* Respond with ACK. */
msg = port_signaling_construct(p, &ucma->address, &ucma->portIdentity); msg = port_signaling_uc_construct(p, &ucma->address, &ucma->portIdentity);
if (!msg) { if (!msg) {
return -1; return -1;
} }

2
unicast_service.c
View File

@ -241,7 +241,7 @@ static int unicast_service_reply(struct port *p, struct ptp_message *dst,
struct ptp_message *msg; struct ptp_message *msg;
int err; int err;
msg = port_signaling_construct(p, &dst->address, msg = port_signaling_uc_construct(p, &dst->address,
&dst->header.sourcePortIdentity); &dst->header.sourcePortIdentity);
if (!msg) { if (!msg) {
return -1; return -1;