fix coding of Node ID: FQDN type
Decode FQDN type Node IDs into "human" dotted notation instead of storing the DNS type data in the FQDN string. Related: OS#5806 Change-Id: I25d0f9b095287aa30e24498d8361c0a326ded447
This commit is contained in:
parent
8368e7d5d5
commit
4f6c95cc77
|
@ -317,8 +317,9 @@ int osmo_pfcp_dec_node_id(void *decoded_struct, void *decode_to, const struct os
|
||||||
osmo_sockaddr_from_octets(&node_id->ip, ip, ip_len);
|
osmo_sockaddr_from_octets(&node_id->ip, ip, ip_len);
|
||||||
break;
|
break;
|
||||||
case OSMO_PFCP_NODE_ID_T_FQDN:
|
case OSMO_PFCP_NODE_ID_T_FQDN:
|
||||||
/* Copy and add a trailing nul */
|
ENSURE_RANGE("FQDN value length", ip_len, 1, sizeof(node_id->fqdn));
|
||||||
OSMO_STRLCPY_ARRAY(node_id->fqdn, ip);
|
if (osmo_apn_to_str(node_id->fqdn, ip, ip_len) == NULL)
|
||||||
|
RETURN_ERROR(-EINVAL, "FQDN: osmo_apn_to_str() failed");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
RETURN_ERROR(-EINVAL, "Invalid Node ID Type: %d", node_id->type);
|
RETURN_ERROR(-EINVAL, "Invalid Node ID Type: %d", node_id->type);
|
||||||
|
@ -330,6 +331,7 @@ int osmo_pfcp_enc_node_id(struct osmo_gtlv_put *tlv, const void *decoded_struct,
|
||||||
{
|
{
|
||||||
unsigned int l;
|
unsigned int l;
|
||||||
const struct osmo_pfcp_ie_node_id *node_id = encode_from;
|
const struct osmo_pfcp_ie_node_id *node_id = encode_from;
|
||||||
|
int rc;
|
||||||
msgb_put_u8(tlv->dst, node_id->type);
|
msgb_put_u8(tlv->dst, node_id->type);
|
||||||
switch (node_id->type) {
|
switch (node_id->type) {
|
||||||
case OSMO_PFCP_NODE_ID_T_IPV4:
|
case OSMO_PFCP_NODE_ID_T_IPV4:
|
||||||
|
@ -341,9 +343,10 @@ int osmo_pfcp_enc_node_id(struct osmo_gtlv_put *tlv, const void *decoded_struct,
|
||||||
osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &node_id->ip);
|
osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &node_id->ip);
|
||||||
break;
|
break;
|
||||||
case OSMO_PFCP_NODE_ID_T_FQDN:
|
case OSMO_PFCP_NODE_ID_T_FQDN:
|
||||||
l = strnlen(node_id->fqdn, sizeof(node_id->fqdn));
|
rc = osmo_apn_from_str(tlv->dst->tail, msgb_tailroom(tlv->dst), node_id->fqdn);
|
||||||
/* Copy without trailing nul */
|
if (rc <= 0)
|
||||||
memcpy((char *)msgb_put(tlv->dst, l), node_id->fqdn, l);
|
RETURN_ERROR(-EINVAL, "osmo_apn_from_str(\"%s\") failed", node_id->fqdn);
|
||||||
|
msgb_put(tlv->dst, rc);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
RETURN_ERROR(-EINVAL, "Invalid Node ID Type: %d", node_id->type);
|
RETURN_ERROR(-EINVAL, "Invalid Node ID Type: %d", node_id->type);
|
||||||
|
|
|
@ -36,8 +36,8 @@ parsed == orig
|
||||||
encoding: ASSOC_SETUP_RESP
|
encoding: ASSOC_SETUP_RESP
|
||||||
PFCPv1 ASSOC_SETUP_RESP hdr={seq=4} ies={ 'Node ID'=fqdn:"example.com" 'Cause'=Request accepted (success) 'Recovery Time Stamp'=724249387 'UP Function Features'=( BUCP PDIU ) }
|
PFCPv1 ASSOC_SETUP_RESP hdr={seq=4} ies={ 'Node ID'=fqdn:"example.com" 'Cause'=Request accepted (success) 'Recovery Time Stamp'=724249387 'UP Function Features'=( BUCP PDIU ) }
|
||||||
osmo_pfcp_msg_encode() rc = 0
|
osmo_pfcp_msg_encode() rc = 0
|
||||||
20 06 00 2b 00 00 04 00 00 3c 00 0c 02 65 78 61 6d 70 6c 65 2e 63 6f 6d 00 13 00 01 01 00 60 00 04 2b 2b 2b 2b 00 2b 00 06 01 02 00 00 00 00 .
|
20 06 00 2c 00 00 04 00 00 3c 00 0d 02 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 13 00 01 01 00 60 00 04 2b 2b 2b 2b 00 2b 00 06 01 02 00 00 00 00 .
|
||||||
osmo_pfcp_msg_decode_header() rc = 47
|
osmo_pfcp_msg_decode_header() rc = 48
|
||||||
rc == msgb_length()
|
rc == msgb_length()
|
||||||
osmo_pfcp_msg_decode_tlv() rc = 0
|
osmo_pfcp_msg_decode_tlv() rc = 0
|
||||||
parsed == orig
|
parsed == orig
|
||||||
|
|
Loading…
Reference in New Issue