diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2020-09-27 00:04:37 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-10-05 14:06:26 +0000 |
| commit | 62af292f38356311f92c8ec1b8307339349db70b (patch) | |
| tree | ecad83b8d702001e0c1a44d17d789af03a28a968 | |
| parent | 97d3978dd03f9ce6a6afce4b0140e1a6f3b200a4 (diff) | |
pcuif_proto: version 10: add support for IPv6 NSVCs
Introduce a address_type in the NSVC configuration pass the given
protocol. The remote_ip is network byte order, the default
encoding for in_addr and in6_addr.
Related: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973
Related: SYS#4915
Change-Id: I740be0a401612bb5ed4e8ccd7f4be8176b936449
| -rw-r--r-- | include/osmocom/bsc/pcuif_proto.h | 12 | ||||
| -rw-r--r-- | src/osmo-bsc/pcu_sock.c | 26 |
2 files changed, 28 insertions, 10 deletions
diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 80d4f9079..8f7260280 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -2,6 +2,7 @@ #define _PCUIF_PROTO_H #include <osmocom/gsm/l1sap.h> +#include <arpa/inet.h> #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" @@ -50,6 +51,11 @@ #define PCU_IF_FLAG_MCS8 (1 << 27) #define PCU_IF_FLAG_MCS9 (1 << 28) +/* NSVC address type */ +#define PCU_IF_ADDR_TYPE_UNSPEC 0x00 /* No address - empty entry */ +#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ +#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -164,7 +170,11 @@ struct gsm_pcu_if_info_ind { uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + uint8_t address_type[2]; + union { + struct in_addr v4; + struct in6_addr v6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 4e9f7bf2b..a1a1cfc18 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -204,17 +204,25 @@ static int pcu_tx_info_ind(struct gsm_bts *bts) for (i = 0; i < ARRAY_SIZE(info_ind->nsvci); i++) { nsvc = &bts->gprs.nsvc[i]; - if (nsvc->remote.u.sa.sa_family == AF_INET6) { - LOGP(DPCU, LOGL_ERROR, "PCU does not support IPv6 NSVC but an IPv6 NSVC was configured!\n"); - continue; - } - if (nsvc->remote.u.sa.sa_family != AF_INET) - continue; - info_ind->nsvci[i] = nsvc->nsvci; info_ind->local_port[i] = nsvc->local_port; - info_ind->remote_port[i] = osmo_ntohs(nsvc->remote.u.sin.sin_port); - info_ind->remote_ip[i] = osmo_ntohl(nsvc->remote.u.sin.sin_addr.s_addr); + switch (nsvc->remote.u.sas.ss_family) { + case AF_INET: + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4; + info_ind->remote_ip[i].v4 = nsvc->remote.u.sin.sin_addr; + info_ind->remote_port[i] = nsvc->remote.u.sin.sin_port; + break; + case AF_INET6: + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV6; + memcpy(&info_ind->remote_ip[i].v6, + &nsvc->remote.u.sin6.sin6_addr, + sizeof(struct in6_addr)); + info_ind->remote_port[i] = nsvc->remote.u.sin6.sin6_port; + break; + default: + info_ind->address_type[i] = PCU_IF_ADDR_TYPE_UNSPEC; + break; + } } for (i = 0; i < ARRAY_SIZE(info_ind->trx); i++) { |