cosmetic: iuup_test.c: update comments and constants names

add constants for AMR headers and payloads instead of hardcoding them as
strings. Rename RTP_PAYLOAD -> AMR_PAYLOAD_VOICE.
test explanations updated accordingly to previous changes (about
stripping/inserting AMR headers).
This commit is contained in:
efistokl 2018-12-25 14:30:44 +02:00
parent 3a4cddbbce
commit 09bf75a895
2 changed files with 27 additions and 23 deletions

View File

@ -108,36 +108,40 @@ void test_cn_session()
#define RTP_HEADER "8060944c6256042c00010102" #define RTP_HEADER "8060944c6256042c00010102"
#define IUUP_HEADER "0100e2b3" #define IUUP_HEADER "0100e2b3"
#define RTP_PAYLOAD "6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0" #define AMR_HEADER_VOICE "703c"
printf("\nReceive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet\n"); #define AMR_HEADER_COMFORT_NOISE "7044"
printf("i.e. should strip away " IUUP_HEADER "\n"); #define AMR_PAYLOAD_VOICE "6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0"
expect_rx_payload = RTP_HEADER "703c" RTP_PAYLOAD; #define AMR_PAYLOAD_COMFORT_NOISE "26e9b851ee"
printf("\nReceive AMR payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet and inserted AMR header\n");
printf("i.e. should replace " IUUP_HEADER " with " AMR_HEADER_VOICE "\n");
expect_rx_payload = RTP_HEADER AMR_HEADER_VOICE AMR_PAYLOAD_VOICE;
rx_pdu(cn, rx_pdu(cn,
msgb_from_hex("IuUP-Data", msgb_from_hex("IuUP-Data",
RTP_HEADER IUUP_HEADER RTP_PAYLOAD)); RTP_HEADER IUUP_HEADER AMR_PAYLOAD_VOICE));
printf("\nReceive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet\n"); printf("\nReceive AMR (comfort noise frame) payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet and inserted AMR (comfort noise) header\n");
printf("i.e. should strip away " "0401479e" "\n"); printf("i.e. should replace 0401479e with " AMR_HEADER_COMFORT_NOISE "\n");
expect_rx_payload = RTP_HEADER "7044" "26e9b851ee"; expect_rx_payload = RTP_HEADER AMR_HEADER_COMFORT_NOISE AMR_PAYLOAD_COMFORT_NOISE;
rx_pdu(cn, rx_pdu(cn,
msgb_from_hex("IuUP-Data", msgb_from_hex("IuUP-Data",
RTP_HEADER "0401479e" "26e9b851ee")); RTP_HEADER "0401479e" AMR_PAYLOAD_COMFORT_NOISE));
printf("\nTransmit RTP. Expecting tx_msg() with inserted IuUP header\n"); printf("\nTransmit RTP. Expecting tx_msg() with inserted IuUP header and removed AMR header\n");
expect_tx_msg = RTP_HEADER "000002b3" RTP_PAYLOAD; expect_tx_msg = RTP_HEADER "000002b3" AMR_PAYLOAD_VOICE;
tx_payload(cn, tx_payload(cn,
msgb_from_hex("RTP data", RTP_HEADER "703c" RTP_PAYLOAD)); msgb_from_hex("RTP data", RTP_HEADER AMR_HEADER_VOICE AMR_PAYLOAD_VOICE));
printf("\nMore RTP, each time the Frame Nr advances, causing a new header CRC.\n"); printf("\nMore RTP, each time the Frame Nr advances, causing a new header CRC.\n");
expect_tx_msg = RTP_HEADER "0100e2b3" RTP_PAYLOAD; expect_tx_msg = RTP_HEADER "0100e2b3" AMR_PAYLOAD_VOICE;
tx_payload(cn, tx_payload(cn,
msgb_from_hex("RTP data", RTP_HEADER "703c" RTP_PAYLOAD)); msgb_from_hex("RTP data", RTP_HEADER AMR_HEADER_VOICE AMR_PAYLOAD_VOICE));
expect_tx_msg = RTP_HEADER "02007eb3" RTP_PAYLOAD; expect_tx_msg = RTP_HEADER "02007eb3" AMR_PAYLOAD_VOICE;
tx_payload(cn, tx_payload(cn,
msgb_from_hex("RTP data", RTP_HEADER "703c" RTP_PAYLOAD)); msgb_from_hex("RTP data", RTP_HEADER AMR_HEADER_VOICE AMR_PAYLOAD_VOICE));
expect_tx_msg = RTP_HEADER "03009eb3" RTP_PAYLOAD; expect_tx_msg = RTP_HEADER "03009eb3" AMR_PAYLOAD_VOICE;
tx_payload(cn, tx_payload(cn,
msgb_from_hex("RTP data", RTP_HEADER "703c" RTP_PAYLOAD)); msgb_from_hex("RTP data", RTP_HEADER AMR_HEADER_VOICE AMR_PAYLOAD_VOICE));
printf("All done.\n"); printf("All done.\n");
} }

View File

@ -9,8 +9,8 @@ node_priv=0x2342
ok: matches expected msg ok: matches expected msg
rc=0 rc=0
Receive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet Receive AMR payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet and inserted AMR header
i.e. should strip away 0100e2b3 i.e. should replace 0100e2b3 with 703c
-PDU-> [IuUP] -PDU-> [IuUP]
8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0
rx_payload() invoked by iuup_cn! rx_payload() invoked by iuup_cn!
@ -20,8 +20,8 @@ node_priv=0x2342
ok: matches expected msg ok: matches expected msg
rc=0 rc=0
Receive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet Receive AMR (comfort noise frame) payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet and inserted AMR (comfort noise) header
i.e. should strip away 0401479e i.e. should replace 0401479e with 7044
-PDU-> [IuUP] -PDU-> [IuUP]
8060944c6256042c000101020401479e26e9b851ee 8060944c6256042c000101020401479e26e9b851ee
rx_payload() invoked by iuup_cn! rx_payload() invoked by iuup_cn!
@ -31,7 +31,7 @@ node_priv=0x2342
ok: matches expected msg ok: matches expected msg
rc=0 rc=0
Transmit RTP. Expecting tx_msg() with inserted IuUP header Transmit RTP. Expecting tx_msg() with inserted IuUP header and removed AMR header
[IuUP] <-RTP- [IuUP] <-RTP-
8060944c6256042c00010102703c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 8060944c6256042c00010102703c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0
tx_msg() invoked by iuup_cn! tx_msg() invoked by iuup_cn!