diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2020-09-16 03:22:30 +0200 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2020-09-16 03:24:18 +0200 |
| commit | f1222fc7243d6af0a7552b23730d7cc91c2dbb2c (patch) | |
| tree | a57c851b5777bb0812c11a88b366c3125bb11f1b | |
| parent | 9ad00d1c288424b337c7a92ba72c7b5e6345ab62 (diff) | |
Revert "pcuif_proto: version 0xa: add support for IPv6 NSVCs"
This reverts commit df93a448b7638f51786236fcabaa6246ebe4ff94.
It was to early because the frequency hopping wasn't ready to be merged.
Change-Id: I6e67f4cd9828afa53ed4e783b83b039ee6a1d570
| -rw-r--r-- | include/osmo-bts/pcuif_proto.h | 14 | ||||
| -rw-r--r-- | src/common/pcu_sock.c | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 983a4c4e..e88607e6 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -2,11 +2,10 @@ #define _PCUIF_PROTO_H #include <osmocom/gsm/l1sap.h> -#include <arpa/inet.h> #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x0a +#define PCU_IF_VERSION 0x09 #define TXT_MAX_LEN 128 /* msg_type */ @@ -51,11 +50,6 @@ #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, @@ -161,11 +155,7 @@ struct gsm_pcu_if_info_ind { uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint8_t address_type[2]; - union { - struct in_addr v4; - struct in6_addr v6; - } remote_ip[2]; + uint32_t remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 0d49f280..aee42ea7 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -244,8 +244,7 @@ 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].v4.s_addr = htonl(nsvc->remote_ip); - info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4; + info_ind->remote_ip[i] = nsvc->remote_ip; } llist_for_each_entry(trx, &bts->trx_list, list) { |