cellular-infrastructure
/
osmo-iuh
mirror of https://gerrit.osmocom.org/osmo-iuh
8
0
Fork 0
Code Issues Releases Wiki Activity

move new_transp_layer_addr to public API 

osmo-hnbgw will use this function in
Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a.

Related: SYS#5859
Change-Id: Icc61620b4d11c4ba6823b40abc7c300f0533c058
changes/64/28264/1
Neels Hofmeyr 2022-06-10 14:13:27 +02:00
parent 753a48141e
commit 3ae6e812f1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/ranap/iu_helpers.h
View File

@ -20,3 +20,4 @@ int ranap_transp_layer_addr_decode2(struct osmo_sockaddr *addr, bool *uses_x213_
RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap);
RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei,
bool use_x213_nsap);
int ranap_new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap);

8
src/iu_helpers.c
View File

@ -143,7 +143,7 @@ int ranap_transp_layer_addr_decode2(struct osmo_sockaddr *addr, bool *uses_x213_
if (len == 20 && buf[0] == 0x35) {
/* For an X.213 NSAP encoded address we expect a buffer of exactly 20 bytes (3 bytes IDP + 17 bytes
* DSP). we also expect AFI = 0x35, which means that two byte IDI and an IP address follows. (see also
* comments in function new_transp_layer_addr below) */
* comments in function ranap_new_transp_layer_addr below) */
x213_nsap = true;
icp = osmo_load16be(&buf[1]);
switch (icp) {
@ -176,7 +176,7 @@ int ranap_transp_layer_addr_decode2(struct osmo_sockaddr *addr, bool *uses_x213_
return 0;
}
static int new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap)
int ranap_new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap)
{
uint8_t *buf;
unsigned int len;
@ -242,7 +242,7 @@ RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockadd
}
tli = CALLOC(1, sizeof(*tli));
rc = new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap);
rc = ranap_new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap);
if (rc < 0) {
ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli);
return NULL;
@ -262,7 +262,7 @@ RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockadd
uint32_t binding_buf = htonl(tei);
int rc;
rc = new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap);
rc = ranap_new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap);
if (rc < 0) {
ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli);
return NULL;