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

Merge branch 'master' into talloc

This commit is contained in:
Harald Welte 2009-06-26 18:19:53 +02:00
parent fe9af26c3e 560982b5d6
commit f16571635a
5 changed files with 1486 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openbsc/include/openbsc/abis_nm.h
View File

@ -116,7 +116,7 @@ enum abis_nm_msgtype {
NM_MT_SET_CHAN_ATTR_NACK,
/* Test Management Messages */
NM_MT_PERF_TEST = 0x51,
NM_MT_PERF_TESET_ACK,
NM_MT_PERF_TEST_ACK,
NM_MT_PERF_TEST_NACK,
NM_MT_TEST_REP,
NM_MT_SEND_TEST_REP,
@ -338,7 +338,7 @@ enum abis_nm_attr {
NM_ATT_BS11_ALL_TEST_CATG = 0x60,
NM_ATT_BS11_BTSLS_HOPPING,
NM_ATT_BS11_CELL_ALLOC_NR,
NM_ATT_BS11_CALL_GLOBAL_ID,
NM_ATT_BS11_CELL_GLOBAL_ID,
NM_ATT_BS11_ENA_INTERF_CLASS = 0x66,
NM_ATT_BS11_ENA_INT_INTEC_HANDO = 0x67,
NM_ATT_BS11_ENA_INT_INTRC_HANDO = 0x68,
@ -422,7 +422,7 @@ enum abis_nm_chan_comb {
NM_CHANC_TCHHalf2 = 0x02,
NM_CHANC_SDCCH = 0x03,
NM_CHANC_mainBCCH = 0x04,
NM_CHANC_BCCCHComb = 0x05,
NM_CHANC_BCCHComb = 0x05,
NM_CHANC_BCCH = 0x06,
NM_CHANC_BCCH_CBCH = 0x07,
NM_CHANC_SDCCH_CBCH = 0x08,
@ -484,7 +484,7 @@ enum abis_nm_nack_cause {
NM_NACK_MSGINCONSIST_PHYSCFG = 0x23,
NM_NACK_FILE_INCOMPLETE = 0x25,
NM_NACK_FILE_NOTAVAIL = 0x26,
MN_NACK_FILE_NOTACTIVATE = 0x27,
NM_NACK_FILE_NOTACTIVATE = 0x27,
NM_NACK_REQ_NOT_GRANT = 0x28,
NM_NACK_WAIT = 0x29,
NM_NACK_NOTH_REPORT_EXIST = 0x2a,

2
openbsc/src/abis_nm.c
View File

@ -179,7 +179,7 @@ static const char *nack_cause_names[] = {
[NM_NACK_MSGINCONSIST_PHYSCFG] = "Message inconsistent with physical configuration",
[NM_NACK_FILE_INCOMPLETE] = "Complete file notreceived",
[NM_NACK_FILE_NOTAVAIL] = "File not available at destination",
[MN_NACK_FILE_NOTACTIVATE] = "File cannot be activate",
[NM_NACK_FILE_NOTACTIVATE] = "File cannot be activate",
[NM_NACK_REQ_NOT_GRANT] = "Request not granted",
[NM_NACK_WAIT] = "Wait",
[NM_NACK_NOTH_REPORT_EXIST] = "Nothing reportable existing",

2
openbsc/src/chan_alloc.c
View File

@ -55,7 +55,7 @@ struct gsm_bts_trx_ts *ts_c0_alloc(struct gsm_bts *bts,
static const enum abis_nm_chan_comb chcomb4pchan[] = {
[GSM_PCHAN_CCCH] = NM_CHANC_mainBCCH,
[GSM_PCHAN_CCCH_SDCCH4] = NM_CHANC_BCCCHComb,
[GSM_PCHAN_CCCH_SDCCH4] = NM_CHANC_BCCHComb,
[GSM_PCHAN_TCH_F] = NM_CHANC_TCHFull,
[GSM_PCHAN_TCH_H] = NM_CHANC_TCHHalf,
[GSM_PCHAN_SDCCH8_SACCH8C] = NM_CHANC_SDCCH,

1463
wireshark/abis_oml.patch Normal file
View File

File diff suppressed because it is too large Load Diff

30
wireshark/abisip.patch
View File

@ -1,7 +1,7 @@
Index: epan/dissectors/Makefile.common
===================================================================
--- epan/dissectors/Makefile.common.orig
+++ epan/dissectors/Makefile.common
--- epan/dissectors/Makefile.common.orig 2009-02-28 15:39:56.000000000 +0100
+++ epan/dissectors/Makefile.common 2009-06-25 15:04:16.000000000 +0200
@@ -873,6 +873,7 @@
# Dissectors with warnings.
#
@ -12,8 +12,8 @@ Index: epan/dissectors/Makefile.common
packet-sccp.c \
Index: epan/dissectors/packet-rsl.c
===================================================================
--- epan/dissectors/packet-rsl.c.orig
+++ epan/dissectors/packet-rsl.c
--- epan/dissectors/packet-rsl.c.orig 2009-02-28 15:39:51.000000000 +0100
+++ epan/dissectors/packet-rsl.c 2009-02-28 15:39:56.000000000 +0100
@@ -3950,6 +3950,7 @@
proto_register_field_array(proto_rsl, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
@ -24,9 +24,9 @@ Index: epan/dissectors/packet-rsl.c
Index: epan/dissectors/packet-abis_ip.c
===================================================================
--- /dev/null
+++ epan/dissectors/packet-abis_ip.c
@@ -0,0 +1,275 @@
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ epan/dissectors/packet-abis_ip.c 2009-06-25 15:04:42.000000000 +0200
@@ -0,0 +1,279 @@
+/* packet-abis_ip.c
+ * Routines for packet dissection of ip.access A-bis over IP
+ * Copyright 2009 by Harald Welte <laforge@gnumonks.org>
@ -209,8 +209,11 @@ Index: epan/dissectors/packet-abis_ip.c
+ "unknown 0x%02x"));
+
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_abisip, tvb,
+ offset, len+3, FALSE);
+ ti = proto_tree_add_protocol_format(tree, proto_abisip,
+ tvb, offset, len+3,
+ "A-bis/IP protocol ip.access, type: %s",
+ val_to_str(msg_type, abisip_protocol_vals,
+ "unknown 0x%02x"));
+ abisip_tree = proto_item_add_subtree(ti, ett_abisip);
+ proto_tree_add_item(abisip_tree, hf_abisip_data_len,
+ tvb, offset+1, 1, FALSE);
@ -227,10 +230,9 @@ Index: epan/dissectors/packet-abis_ip.c
+ break;
+ case ABISIP_OML:
+ /* hand this off to the standard A-bis OML dissector */
+#if 0
+ call_dissector(sub_handles[SUB_OML], next_tvb,
+ pinfo, tree);
+#endif
+ if (sub_handles[SUB_OML])
+ call_dissector(sub_handles[SUB_OML], next_tvb,
+ pinfo, tree);
+ break;
+ case ABISIP_IPACCESS:
+ dissect_ipaccess(next_tvb, pinfo, tree);
@ -287,6 +289,8 @@ Index: epan/dissectors/packet-abis_ip.c
+ proto_register_field_array(proto_abisip, hf, array_length(hf));
+ proto_register_field_array(proto_ipaccess, hf_ipa, array_length(hf_ipa));
+ proto_register_subtree_array(ett, array_length(ett));
+
+ register_dissector("gsm_abis_ip", dissect_abisip, proto_abisip);
+}
+
+void proto_reg_handoff_abisip(void)