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

tlv: Encode and decode SLAVE_DELAY_TIMING_DATA_NP TLVs. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2020-04-15 10:53:22 -07:00
parent 2d2637989c
commit ef9d51a47d
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tlv.c
View File

@ -594,6 +594,55 @@ static void org_pre_send(struct organization_tlv *org)
} }
} }
static int slave_delay_timing_data_post_revc(struct tlv_extra *extra)
{
struct slave_delay_timing_data_tlv *slave_delay =
(struct slave_delay_timing_data_tlv *) extra->tlv;
size_t base_size = sizeof(slave_delay->sourcePortIdentity), n_items;
struct slave_delay_timing_record *record;
if (tlv_array_invalid(extra->tlv, base_size, sizeof(*record))) {
return -EBADMSG;
}
n_items = tlv_array_count(extra->tlv, base_size, sizeof(*record));
record = slave_delay->record;
NTOHS(slave_delay->sourcePortIdentity.portNumber);
while (n_items) {
NTOHS(record->sequenceId);
timestamp_net2host(&record->delayOriginTimestamp);
net2host64_unaligned(&record->totalCorrectionField);
timestamp_net2host(&record->delayResponseTimestamp);
n_items--;
record++;
}
return 0;
}
static void slave_delay_timing_data_pre_send(struct tlv_extra *extra)
{
struct slave_delay_timing_data_tlv *slave_delay =
(struct slave_delay_timing_data_tlv *) extra->tlv;
size_t base_size = sizeof(slave_delay->sourcePortIdentity), n_items;
struct slave_delay_timing_record *record;
n_items = tlv_array_count(extra->tlv, base_size, sizeof(*record));
record = slave_delay->record;
HTONS(slave_delay->sourcePortIdentity.portNumber);
while (n_items) {
HTONS(record->sequenceId);
timestamp_host2net(&record->delayOriginTimestamp);
host2net64_unaligned(&record->totalCorrectionField);
timestamp_host2net(&record->delayResponseTimestamp);
n_items--;
record++;
}
}
static int slave_rx_sync_timing_data_post_revc(struct tlv_extra *extra) static int slave_rx_sync_timing_data_post_revc(struct tlv_extra *extra)
{ {
struct slave_rx_sync_timing_data_tlv *slave_data = struct slave_rx_sync_timing_data_tlv *slave_data =
@ -819,6 +868,10 @@ int tlv_post_recv(struct tlv_extra *extra)
break; break;
case TLV_SLAVE_RX_SYNC_COMPUTED_DATA: case TLV_SLAVE_RX_SYNC_COMPUTED_DATA:
case TLV_SLAVE_TX_EVENT_TIMESTAMPS: case TLV_SLAVE_TX_EVENT_TIMESTAMPS:
break;
case TLV_SLAVE_DELAY_TIMING_DATA_NP:
result = slave_delay_timing_data_post_revc(extra);
break;
case TLV_CUMULATIVE_RATE_RATIO: case TLV_CUMULATIVE_RATE_RATIO:
case TLV_PAD: case TLV_PAD:
case TLV_AUTHENTICATION: case TLV_AUTHENTICATION:
@ -879,6 +932,10 @@ void tlv_pre_send(struct TLV *tlv, struct tlv_extra *extra)
break; break;
case TLV_SLAVE_RX_SYNC_COMPUTED_DATA: case TLV_SLAVE_RX_SYNC_COMPUTED_DATA:
case TLV_SLAVE_TX_EVENT_TIMESTAMPS: case TLV_SLAVE_TX_EVENT_TIMESTAMPS:
break;
case TLV_SLAVE_DELAY_TIMING_DATA_NP:
slave_delay_timing_data_pre_send(extra);
break;
case TLV_CUMULATIVE_RATE_RATIO: case TLV_CUMULATIVE_RATE_RATIO:
case TLV_PAD: case TLV_PAD:
case TLV_AUTHENTICATION: case TLV_AUTHENTICATION:

20
tlv.h
View File

@ -50,6 +50,7 @@
#define TLV_SLAVE_RX_SYNC_TIMING_DATA 0x8004 #define TLV_SLAVE_RX_SYNC_TIMING_DATA 0x8004
#define TLV_SLAVE_RX_SYNC_COMPUTED_DATA 0x8005 #define TLV_SLAVE_RX_SYNC_COMPUTED_DATA 0x8005
#define TLV_SLAVE_TX_EVENT_TIMESTAMPS 0x8006 #define TLV_SLAVE_TX_EVENT_TIMESTAMPS 0x8006
#define TLV_SLAVE_DELAY_TIMING_DATA_NP 0x7F00
#define TLV_CUMULATIVE_RATE_RATIO 0x8007 #define TLV_CUMULATIVE_RATE_RATIO 0x8007
#define TLV_PAD 0x8008 #define TLV_PAD 0x8008
#define TLV_AUTHENTICATION 0x8009 #define TLV_AUTHENTICATION 0x8009
@ -237,6 +238,25 @@ struct request_unicast_xmit_tlv {
UInteger32 durationField; UInteger32 durationField;
} PACKED; } PACKED;
struct slave_delay_timing_record {
UInteger16 sequenceId;
struct Timestamp delayOriginTimestamp;
TimeInterval totalCorrectionField;
struct Timestamp delayResponseTimestamp;
} PACKED;
struct slave_delay_timing_data_tlv {
Enumeration16 type;
UInteger16 length;
struct PortIdentity sourcePortIdentity;
struct slave_delay_timing_record record[0];
} PACKED;
#define SLAVE_DELAY_TIMING_MAX \
((sizeof(struct message_data) - sizeof(struct signaling_msg) - \
sizeof(struct slave_delay_timing_data_tlv)) / \
sizeof(struct slave_delay_timing_record))
struct slave_rx_sync_timing_record { struct slave_rx_sync_timing_record {
UInteger16 sequenceId; UInteger16 sequenceId;
struct Timestamp syncOriginTimestamp; struct Timestamp syncOriginTimestamp;