mncc: Support IPv6 addresses (new version mncc 7)
Apparently commit 06b859ca314f53a902329ed95848dbafef1d4f87 forgot to
bump the MNCC_SOCK_VERSION field from 5 to 6.
Change-Id: I5448ff931ec33f24f4837a51376f1703fe97683b
diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 0a8e7d9..bd233ce 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -373,7 +373,8 @@
type record MNCC_PDU_Rtp {
uint32_t callref,
- uint32_t ip,
+ boolean is_ipv6,
+ octetstring ip,
uint16_t rtp_port,
uint32_t payload_type,
uint32_t payload_msg_type,
@@ -421,6 +422,8 @@
external function dec_MNCC_PDU(in octetstring stream) return MNCC_PDU;
+external function set_MNCC_version(in integer version) return boolean;
+
template (value) MNCC_PDU ts_MNCC_HELLO(uint32_t version := 5) := {
msg_type := MNCC_SOCKET_HELLO,
u := {
@@ -1921,7 +1924,8 @@
u := {
rtp := {
callref := call_id,
- ip := 0,
+ is_ipv6 := false,
+ ip := '00000000'O,
rtp_port := 0,
payload_type := 0,
payload_msg_type := 0,
@@ -1935,13 +1939,14 @@
/* MSC -> MNCC: RTP_CREATE.rsp; acknowledge creation of RTP (stating MSC side IP/Port) */
template MNCC_PDU tr_MNCC_RTP_CREATE(template uint32_t call_id := ?,
- template uint32_t ip := ?,
- template uint32_t rtp_port := ?,
+ template octetstring ip := ?,
+ template uint16_t rtp_port := ?,
template uint32_t payload_type := ?) := {
msg_type := MNCC_RTP_CREATE,
u := {
rtp := {
callref := call_id,
+ is_ipv6 := ?,
ip := ip,
rtp_port := rtp_port,
payload_type := payload_type,
@@ -1952,11 +1957,12 @@
}
/* MSC <- MNCC: RTP_CONNECT.req; request connect of RTP */
-template MNCC_PDU ts_MNCC_RTP_CONNECT(uint32_t call_id, uint32_t ip, uint32_t rtp_port, uint32_t pt) := {
+template MNCC_PDU ts_MNCC_RTP_CONNECT(uint32_t call_id, boolean is_ipv6, octetstring ip, uint16_t rtp_port, uint32_t pt) := {
msg_type := MNCC_RTP_CONNECT,
u := {
rtp := {
callref := call_id,
+ is_ipv6 := is_ipv6,
ip := ip,
rtp_port := rtp_port,
payload_type := pt,
@@ -1966,13 +1972,14 @@
}
}
template MNCC_PDU tr_MNCC_RTP_CONNECT(template uint32_t call_id,
- template uint32_t ip := ?,
- template uint32_t rtp_port := ?,
+ template octetstring ip := ?,
+ template uint16_t rtp_port := ?,
template uint32_t pt := ?) := {
msg_type := MNCC_RTP_CONNECT,
u := {
rtp := {
callref := call_id,
+ is_ipv6 := ?,
ip := ip,
rtp_port := rtp_port,
payload_type := pt,