library/RSL_Types: use OCT4 for local/remote address fields
This way functions like f_inet_addr() and f_inet6_addr() can be
used directly without converting between bytes and integers.
Change-Id: I389a8cb95c025c9dddc751789223621c15d9b48f
diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn
index 72fb525..9771087 100644
--- a/bsc/BSC_Tests_LCLS.ttcn
+++ b/bsc/BSC_Tests_LCLS.ttcn
@@ -303,7 +303,7 @@
/* mandatory fields */
fixme_unused := f_rsl_find_ie(rsl_msg, RSL_IE_IPAC_REMOTE_IP, ie);
- host := f_inet_ntoa(int2oct(ie.ipa_remote_ip, 4));
+ host := f_inet_ntoa(ie.ipa_remote_ip);
fixme_unused := f_rsl_find_ie(rsl_msg, RSL_IE_IPAC_REMOTE_PORT, ie);
port_num := ie.ipa_remote_port;
@@ -315,9 +315,9 @@
}
if (send_on_a == true) {
- CONN_A.send(ts_RSL_IPA_MDCX_ACK(chan_nr, conn_id, oct2int(f_inet_addr(host)), port_num, rtp_pt));
+ CONN_A.send(ts_RSL_IPA_MDCX_ACK(chan_nr, conn_id, f_inet_addr(host), port_num, rtp_pt));
} else {
- CONN_B.send(ts_RSL_IPA_MDCX_ACK(chan_nr, conn_id, oct2int(f_inet_addr(host)), port_num, rtp_pt));
+ CONN_B.send(ts_RSL_IPA_MDCX_ACK(chan_nr, conn_id, f_inet_addr(host), port_num, rtp_pt));
}
}
diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn
index 9ecb255..25dee23 100644
--- a/bsc/BSC_Tests_VAMOS.ttcn
+++ b/bsc/BSC_Tests_VAMOS.ttcn
@@ -425,7 +425,7 @@
rtp_pt := ie.ipa_rtp_pt;
}
RSL.send(ts_RSL_IPA_CRCX_ACK(new_chan_nr, 123,
- oct2int(f_inet_addr("1.2.3.4")),
+ f_inet_addr("1.2.3.4"),
4321,
rtp_pt));
}
@@ -436,7 +436,7 @@
/* mandatory */
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie);
var HostPort peer;
- peer.host := f_inet_ntoa(int2oct(ie.ipa_remote_ip, 4));
+ peer.host := f_inet_ntoa(ie.ipa_remote_ip);
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_PORT, ie);
peer.port_nr := ie.ipa_remote_port;
var uint7_t rtp_pt := 0;
@@ -445,7 +445,7 @@
rtp_pt := ie.ipa_rtp_pt;
}
RSL.send(ts_RSL_IPA_MDCX_ACK(new_chan_nr, conn_id,
- oct2int(f_inet_addr(peer.host)),
+ f_inet_addr(peer.host),
peer.port_nr,
rtp_pt));
}
@@ -535,7 +535,7 @@
rtp_pt := ie.ipa_rtp_pt;
}
RSL.send(ts_RSL_IPA_CRCX_ACK(new_chan_nr, 123,
- oct2int(f_inet_addr("1.2.3.4")),
+ f_inet_addr("1.2.3.4"),
4321,
rtp_pt));
}
@@ -546,7 +546,7 @@
/* mandatory */
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie);
var HostPort peer;
- peer.host := f_inet_ntoa(int2oct(ie.ipa_remote_ip, 4));
+ peer.host := f_inet_ntoa(ie.ipa_remote_ip);
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_PORT, ie);
peer.port_nr := ie.ipa_remote_port;
var uint7_t rtp_pt := 0;
@@ -555,7 +555,7 @@
rtp_pt := ie.ipa_rtp_pt;
}
RSL.send(ts_RSL_IPA_MDCX_ACK(new_chan_nr, conn_id,
- oct2int(f_inet_addr(peer.host)),
+ f_inet_addr(peer.host),
peer.port_nr,
rtp_pt));
}
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 2d0bd27..3e2e4f7 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -200,7 +200,7 @@
g_media.bts.rtp_pt := ie.ipa_rtp_pt2;
}
RSL.send(ts_RSL_IPA_CRCX_ACK(g_chan_nr, g_media.bts.conn_id,
- oct2int(f_inet_addr(g_media.bts.bts.host)),
+ f_inet_addr(g_media.bts.bts.host),
g_media.bts.bts.port_nr,
g_media.bts.rtp_pt));
g_media.bts.ipa_crcx_seen := true;
@@ -214,7 +214,7 @@
}
/* mandatory */
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie);
- g_media.bts.peer.host := f_inet_ntoa(int2oct(ie.ipa_remote_ip, 4));
+ g_media.bts.peer.host := f_inet_ntoa(ie.ipa_remote_ip);
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_PORT, ie);
g_media.bts.peer.port_nr := ie.ipa_remote_port;
/* optional */
@@ -225,7 +225,7 @@
g_media.bts.rtp_pt := ie.ipa_rtp_pt2;
}
RSL.send(ts_RSL_IPA_MDCX_ACK(g_chan_nr, g_media.bts.conn_id,
- oct2int(f_inet_addr(g_media.bts.peer.host)),
+ f_inet_addr(g_media.bts.peer.host),
g_media.bts.peer.port_nr,
g_media.bts.rtp_pt));
g_media.bts.ipa_mdcx_seen := true;
@@ -242,7 +242,7 @@
g_media.bts1.rtp_pt := ie.ipa_rtp_pt2;
}
RSL1.send(ts_RSL_IPA_CRCX_ACK(g_chan_nr, g_media.bts1.conn_id,
- oct2int(f_inet_addr(g_media.bts1.bts.host)),
+ f_inet_addr(g_media.bts1.bts.host),
g_media.bts1.bts.port_nr,
g_media.bts1.rtp_pt));
g_media.bts1.ipa_crcx_seen := true;
@@ -257,7 +257,7 @@
}
/* mandatory */
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie);
- g_media.bts1.peer.host := f_inet_ntoa(int2oct(ie.ipa_remote_ip, 4));
+ g_media.bts1.peer.host := f_inet_ntoa(ie.ipa_remote_ip);
b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_PORT, ie);
g_media.bts1.peer.port_nr := ie.ipa_remote_port;
/* optional */
@@ -268,7 +268,7 @@
g_media.bts1.rtp_pt := ie.ipa_rtp_pt2;
}
RSL1.send(ts_RSL_IPA_MDCX_ACK(g_chan_nr, g_media.bts1.conn_id,
- oct2int(f_inet_addr(g_media.bts1.peer.host)),
+ f_inet_addr(g_media.bts1.peer.host),
g_media.bts1.peer.port_nr,
g_media.bts1.rtp_pt));
g_media.bts1.ipa_mdcx_seen := true;