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

add code to ipaccess-config set nanoBST NVRAM attributes

This commit is contained in:
Harald Welte 2009-07-03 11:26:45 +02:00
parent 1cc3fa8102
commit 684b1a875a
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openbsc/src/abis_nm.c
View File

@ -2282,6 +2282,18 @@ static int abis_nm_rx_ipacc(struct msgb *msg)
else
DEBUGPC(DNM, "\n");
break;
case NM_MT_IPACC_GET_NVATTR_ACK:
DEBUGPC(DNM, "GET NVATTR ACK\n");
/* FIXME: decode and show the actual attributes */
break;
case NM_MT_IPACC_GET_NVATTR_NACK:
DEBUGPC(DNM, "GET NVATTR NACK ");
if (TLVP_PRESENT(&tp, NM_ATT_NACK_CAUSES))
DEBUGPC(DNM, " CAUSE=%s\n",
nack_cause_name(*TLVP_VAL(&tp, NM_ATT_NACK_CAUSES)));
else
DEBUGPC(DNM, "\n");
break;
default:
DEBUGPC(DNM, "unknown\n");
break;

31
openbsc/src/ipaccess-config.c
View File

@ -43,6 +43,8 @@ static struct gsm_network *gsmnet;
static int restart;
static char *prim_oml_ip;
static char *unit_id;
static u_int16_t nv_flags;
static u_int16_t nv_mask;
/*
static u_int8_t prim_oml_attr[] = { 0x95, 0x00, 7, 0x88, 192, 168, 100, 11, 0x00, 0x00 };
@ -53,6 +55,7 @@ static void bootstrap_om(struct gsm_bts *bts)
{
int len;
static u_int8_t buf[1024];
u_int8_t *cur = buf;
printf("OML link established\n");
@ -70,7 +73,6 @@ static void bootstrap_om(struct gsm_bts *bts)
}
if (prim_oml_ip) {
struct in_addr ia;
u_int8_t *cur = buf;
if (!inet_aton(prim_oml_ip, &ia)) {
fprintf(stderr, "invalid IP address: %s\n",
@ -92,6 +94,20 @@ static void bootstrap_om(struct gsm_bts *bts)
printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia));
abis_nm_ipaccess_set_nvattr(bts, buf, 3+len);
}
if (nv_mask) {
len = 4;
*cur++ = NM_ATT_IPACC_NV_FLAGS;
*cur++ = (len) >> 8;
*cur++ = (len) & 0xff;
*cur++ = nv_flags & 0xff;
*cur++ = nv_mask & 0xff;
*cur++ = nv_flags >> 8;
*cur++ = nv_mask >> 8;
printf("setting NV Flags/Mask to 0x%04x/0x%04x\n",
nv_flags, nv_mask);
abis_nm_ipaccess_set_nvattr(bts, buf, 3+len);
}
if (restart) {
printf("restarting BTS\n");
@ -140,13 +156,15 @@ int main(int argc, char **argv)
while (1) {
int c;
unsigned long ul;
char *slash;
static struct option long_options[] = {
{ "unit-id", 1, 0, 'u' },
{ "oml-ip", 1, 0, 'o' },
{ "restart", 0, 0, 'r' },
};
c = getopt_long(argc, argv, "u:o:r", long_options,
c = getopt_long(argc, argv, "u:o:rn:", long_options,
&option_index);
if (c == -1)
@ -162,6 +180,15 @@ int main(int argc, char **argv)
case 'r':
restart = 1;
break;
case 'n':
slash = strchr(optarg, '/');
if (!slash)
exit(2);
ul = strtoul(optarg, NULL, 16);
nv_flags = ul & 0xffff;
ul = strtoul(slash+1, NULL, 16);
nv_mask = ul & 0xffff;
break;
}
};