Skip to content

P
PPSi
Commit ec332e3f authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

handling of is_from_self flag

parent 26ea047c
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 7 deletions
include/pproto/pproto.h
View file @ ec332e3f
...@@ -148,6 +148,7 @@ struct pp_instance { ...@@ -148,6 +148,7 @@ struct pp_instance {
*/ */
MsgHeader msg_tmp_header; MsgHeader msg_tmp_header;
MsgHeader pdelay_req_hdr; MsgHeader pdelay_req_hdr;
int is_from_self;
}; };
...@@ -191,7 +192,7 @@ extern UInteger8 bmc(struct pp_frgn_master *frgn_master, ...@@ -191,7 +192,7 @@ extern UInteger8 bmc(struct pp_frgn_master *frgn_master,
/* msg.c */ /* msg.c */
extern void msg_pack_header(void *buf, struct pp_instance *ppi); extern void msg_pack_header(void *buf, struct pp_instance *ppi);
extern void msg_unpack_header(void *buf, MsgHeader *hdr); extern void msg_unpack_header(void *buf, struct pp_instance *ppi);
extern void msg_pack_sync(void *buf, Timestamp *orig_tstamp, extern void msg_pack_sync(void *buf, Timestamp *orig_tstamp,
struct pp_instance *ppi); struct pp_instance *ppi);
extern void msg_unpack_sync(void *buf, MsgSync *sync); extern void msg_unpack_sync(void *buf, MsgSync *sync);
......
proto-standard/msg.c
View file @ ec332e3f
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
/* Unpack header from in buffer to msg_tmp_header field */ /* Unpack header from in buffer to msg_tmp_header field */
void msg_unpack_header(void *buf, MsgHeader *hdr) void msg_unpack_header(void *buf, struct pp_instance *ppi)
{ {
MsgHeader *hdr = &ppi->msg_tmp_header;
hdr->transportSpecific = (*(Nibble *) (buf + 0)) >> 4; hdr->transportSpecific = (*(Nibble *) (buf + 0)) >> 4;
hdr->messageType = (*(Enumeration4 *) (buf + 0)) & 0x0F; hdr->messageType = (*(Enumeration4 *) (buf + 0)) & 0x0F;
hdr->versionPTP = (*(UInteger4 *) (buf + 1)) & 0x0F; hdr->versionPTP = (*(UInteger4 *) (buf + 1)) & 0x0F;
...@@ -31,6 +33,16 @@ void msg_unpack_header(void *buf, MsgHeader *hdr) ...@@ -31,6 +33,16 @@ void msg_unpack_header(void *buf, MsgHeader *hdr)
hdr->controlField = (*(UInteger8 *) (buf + 32)); hdr->controlField = (*(UInteger8 *) (buf + 32));
hdr->logMessageInterval = (*(Integer8 *) (buf + 33)); hdr->logMessageInterval = (*(Integer8 *) (buf + 33));
if (DSPOR(ppi)->portIdentity.portNumber ==
ppi->msg_tmp_header.sourcePortIdentity.portNumber
&& !pp_memcmp(ppi->msg_tmp_header.sourcePortIdentity.clockIdentity,
DSPOR(ppi)->portIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH))
ppi->is_from_self = 1;
else
ppi->is_from_self = 0;
/* FIXME: diag /* FIXME: diag
#ifdef PTPD_DBG #ifdef PTPD_DBG
msgHeader_display(header); msgHeader_display(header);
......
proto-standard/state-listening.c
View file @ ec332e3f
...@@ -16,12 +16,13 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -16,12 +16,13 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
goto state_updated; goto state_updated;
if (ppi->msg_tmp_header.messageType == PPM_ANNOUNCE) { if (ppi->msg_tmp_header.messageType == PPM_ANNOUNCE) {
/* TODO check isFromSelf?
if (isFromSelf) { if (ppi->is_from_self) {
/* FIXME diag
DBGV("HandleAnnounce : Ignore message from self \n"); DBGV("HandleAnnounce : Ignore message from self \n");
*/
return; return;
} }
*/
/* FIXME diag /* FIXME diag
* DBGV("Announce message from another foreign master"); * DBGV("Announce message from another foreign master");
......
proto-standard/state-passive.c
View file @ ec332e3f
...@@ -19,7 +19,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -19,7 +19,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (ppi->msg_tmp_header.messageType == PPM_PDELAY_REQ) { if (ppi->msg_tmp_header.messageType == PPM_PDELAY_REQ) {
#ifdef _FROM_PTPD_2_1_0_ #ifdef _FROM_PTPD_2_1_0_
/* TODO "translate" it into ptp-wr structs*/ /* TODO "translate" it into ptp-wr structs*/
if (isFromSelf) { if (ppi->is_from_self) {
/* /*
* Get sending timestamp from IP stack * Get sending timestamp from IP stack
* with So_TIMESTAMP * with So_TIMESTAMP
......
state-machine.c
View file @ ec332e3f
...@@ -19,7 +19,7 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen) ...@@ -19,7 +19,7 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
int state, err; int state, err;
if (packet) { if (packet) {
msg_unpack_header(packet, &ppi->msg_tmp_header); msg_unpack_header(packet, ppi);
} }
state = ppi->state; state = ppi->state;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment