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

Revert "pcuif_proto: version 0xa: add support for IPv6 NSVCs" 

This reverts commit 38aaa10ed4.
It was to early because the frequency hopping wasn't ready to be merged.

Change-Id: Ibf055d5adfd9bffaaf51cb8468c79be597467e0f
This commit is contained in:
Alexander Couzens 2020-09-16 03:22:06 +02:00
parent 38aaa10ed4
commit 40a9e603b9
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/osmocom/pcu/pcuif_proto.h
View File

@ -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 {

15
src/pcu_l1_if.cpp
View File

@ -567,22 +567,11 @@ bssgp_failed:
LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]);
LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]);
LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]);
ia.s_addr = info_ind->remote_ip[0].v4.s_addr;
ia.s_addr = htonl(info_ind->remote_ip[0]);
LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia));
switch (info_ind->address_type[0]) {
case PCU_IF_ADDR_TYPE_IPV4:
break;
case PCU_IF_ADDR_TYPE_IPV6:
LOGP(DL1IF, LOGL_ERROR, "This PCU does not support IPv6 NSVC!\n");
goto bssgp_failed;
default:
LOGP(DL1IF, LOGL_ERROR, "No IPv4 NSVC given!\n");
goto bssgp_failed;
}
pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0],
ntohl(info_ind->remote_ip[0].v4.s_addr), info_ind->remote_port[0],
info_ind->remote_ip[0], info_ind->remote_port[0],
info_ind->nsei, info_ind->nsvci[0], info_ind->bvci,
info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac,
info_ind->cell_id);