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. Change-Id: I6d60277eb5b8d938d9f38114c933d58ee1b884c9 Related: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Related: SYS#4915
This commit is contained in:
parent
2302cb162c
commit
27c5fd9369
|
@ -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 {
|
||||
|
|
|
@ -332,7 +332,8 @@ int pcu_tx_info_ind(void)
|
|||
info_ind->nsvci[i] = nsvc->nsvci;
|
||||
info_ind->local_port[i] = nsvc->local_port;
|
||||
info_ind->remote_port[i] = nsvc->remote_port;
|
||||
info_ind->remote_ip[i] = nsvc->remote_ip;
|
||||
info_ind->remote_ip[i].v4.s_addr = htonl(nsvc->remote_ip);
|
||||
info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4;
|
||||
}
|
||||
|
||||
llist_for_each_entry(trx, &bts->trx_list, list) {
|
||||
|
|
Loading…
Reference in New Issue