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

Add the peer delay messages into the message layer. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2012-04-02 17:20:04 +02:00
parent 28dc3613d7
commit e213ff0479
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
msg.c
View File

@ -113,6 +113,16 @@ static char *msg_type_string(int type)
return "unknown"; return "unknown";
} }
static void port_id_post_recv(struct PortIdentity *pid)
{
pid->portNumber = ntohs(pid->portNumber);
}
static void port_id_pre_send(struct PortIdentity *pid)
{
pid->portNumber = htons(pid->portNumber);
}
static void timestamp_post_recv(struct ptp_message *m, struct Timestamp *ts) static void timestamp_post_recv(struct ptp_message *m, struct Timestamp *ts)
{ {
uint32_t lsb = ntohl(ts->seconds_lsb); uint32_t lsb = ntohl(ts->seconds_lsb);
@ -179,6 +189,8 @@ int msg_post_recv(struct ptp_message *m, int cnt)
case PDELAY_RESP: case PDELAY_RESP:
if (cnt < sizeof(struct pdelay_resp_msg)) if (cnt < sizeof(struct pdelay_resp_msg))
return -1; return -1;
timestamp_post_recv(m, &m->pdelay_resp.requestReceiptTimestamp);
port_id_post_recv(&m->pdelay_resp.requestingPortIdentity);
break; break;
case FOLLOW_UP: case FOLLOW_UP:
if (cnt < sizeof(struct follow_up_msg)) if (cnt < sizeof(struct follow_up_msg))
@ -193,6 +205,8 @@ int msg_post_recv(struct ptp_message *m, int cnt)
case PDELAY_RESP_FOLLOW_UP: case PDELAY_RESP_FOLLOW_UP:
if (cnt < sizeof(struct pdelay_resp_fup_msg)) if (cnt < sizeof(struct pdelay_resp_fup_msg))
return -1; return -1;
timestamp_post_recv(m, &m->pdelay_resp_fup.responseOriginTimestamp);
port_id_post_recv(&m->pdelay_resp_fup.requestingPortIdentity);
break; break;
case ANNOUNCE: case ANNOUNCE:
if (cnt < sizeof(struct announce_msg)) if (cnt < sizeof(struct announce_msg))
@ -231,8 +245,11 @@ int msg_pre_send(struct ptp_message *m)
case DELAY_REQ: case DELAY_REQ:
break; break;
case PDELAY_REQ: case PDELAY_REQ:
break;
case PDELAY_RESP: case PDELAY_RESP:
return -1; timestamp_pre_send(&m->pdelay_resp.requestReceiptTimestamp);
port_id_pre_send(&m->pdelay_resp.requestingPortIdentity);
break;
case FOLLOW_UP: case FOLLOW_UP:
timestamp_pre_send(&m->follow_up.preciseOriginTimestamp); timestamp_pre_send(&m->follow_up.preciseOriginTimestamp);
break; break;
@ -242,7 +259,9 @@ int msg_pre_send(struct ptp_message *m)
htons(m->delay_resp.requestingPortIdentity.portNumber); htons(m->delay_resp.requestingPortIdentity.portNumber);
break; break;
case PDELAY_RESP_FOLLOW_UP: case PDELAY_RESP_FOLLOW_UP:
return -1; timestamp_pre_send(&m->pdelay_resp_fup.responseOriginTimestamp);
port_id_pre_send(&m->pdelay_resp_fup.requestingPortIdentity);
break;
case ANNOUNCE: case ANNOUNCE:
announce_pre_send(&m->announce); announce_pre_send(&m->announce);
break; break;

2
msg.h
View File

@ -154,6 +154,8 @@ struct ptp_message {
* - follow_up preciseOriginTimestamp * - follow_up preciseOriginTimestamp
* - sync originTimestamp * - sync originTimestamp
* - delay_req originTimestamp * - delay_req originTimestamp
* - pdelay_resp requestReceiptTimestamp
* - pdelay_resp_fup responseOriginTimestamp
*/ */
struct timestamp pdu; struct timestamp pdu;
/** /**