From c17f57053802c8b151df38169b73eef804ce2b3e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 24 Jun 2012 21:52:07 +0200 Subject: [PATCH] ganc: add value_strings for GAN message type and protocol discriminator --- include/osmocom/gsm/Makefile.am | 2 +- include/osmocom/gsm/gan.h | 9 ++++ src/gsm/Makefile.am | 2 +- src/gsm/gan.c | 77 +++++++++++++++++++++++++++++++++ src/gsm/libosmogsm.map | 3 ++ 5 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 include/osmocom/gsm/gan.h create mode 100644 src/gsm/gan.c diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am index fc1abfe8d..60ba48b9c 100644 --- a/include/osmocom/gsm/Makefile.am +++ b/include/osmocom/gsm/Makefile.am @@ -1,7 +1,7 @@ osmogsm_HEADERS = a5.h comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \ gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h abis_nm.h \ sysinfo.h prim.h gsm0502.h lapd_core.h lapdm.h \ - gsm0411_utils.h gsm0411_smc.h gsm0411_smr.h + gsm0411_utils.h gsm0411_smc.h gsm0411_smr.h gan.h SUBDIRS = protocol diff --git a/include/osmocom/gsm/gan.h b/include/osmocom/gsm/gan.h new file mode 100644 index 000000000..ab4c1e4e5 --- /dev/null +++ b/include/osmocom/gsm/gan.h @@ -0,0 +1,9 @@ +#ifndef _OSMO_GSM_GAN_H +#define _OSMO_GSM_GAN_H + +#include + +extern const struct value_string gan_msgt_vals[]; +static const struct value_string gan_pdisc_vals[]; + +#endif diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 7796caffe..167aeb7b7 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -19,7 +19,7 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c gsm_utils.c \ lapd_core.c lapdm.c \ auth_core.c auth_comp128v1.c auth_milenage.c \ milenage/aes-encblock.c milenage/aes-internal.c \ - milenage/aes-internal-enc.c milenage/milenage.c + milenage/aes-internal-enc.c milenage/milenage.c gan.c libosmogsm_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libosmogsm.map -version-info $(LIBVERSION) libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la diff --git a/src/gsm/gan.c b/src/gsm/gan.c new file mode 100644 index 000000000..e041936e3 --- /dev/null +++ b/src/gsm/gan.c @@ -0,0 +1,77 @@ +/* (C) 2012 by Harald Welte + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +#include + + +const struct value_string gan_msgt_vals[] = { + { GA_MT_RC_DISCOVERY_REQUEST, "GA-RC DISCOVERY REQUEST" }, + { GA_MT_RC_DISCOVERY_ACCEPT, "GA-RC DISCOVERY ACCEPT" }, + { GA_MT_RC_DISCOVERY_REJECT, "GA-RC DISCOVERY REJECT" }, + { GA_MT_RC_REGISTER_REQUEST, "GA-RC REGISTER REQUEST" }, + { GA_MT_RC_REGISTER_ACCEPT, "GA-RC REGISTER ACCEPT" }, + { GA_MT_RC_REGISTER_REDIRECT, "GA-RC REGISTER REDIRECT" }, + { GA_MT_RC_REGISTER_REJECT, "GA-RC REGISTER REJECT" }, + { GA_MT_RC_DEREGISTER, "GA-RC DEREGISTER" }, + { GA_MT_RC_REGISTER_UPDATE_UL, "GA-RC REGISTER UPDATE UL" }, + { GA_MT_RC_REGISTER_UPDATE_DL, "GA-RC REGISTER UPDATE DL" }, + { GA_MT_RC_CELL_BCAST_INFO, "GA-RC CELL BROADCAST INFO" }, + { GA_MT_CSR_CIPH_MODE_CMD, "GA-CSR CIPHER MDOE COMMAND" }, + { GA_MT_CSR_CIPH_MODE_COMPL, "GA-CSR CIPHER MODE COMPLETE" }, + { GA_MT_CSR_ACT_CHAN, "GA-CSR ACTIVATE CHANNEL" }, + { GA_MT_CSR_ACT_CHAN_ACK, "GA-CSR ACTIVATE CHANNEL ACK" }, + { GA_MT_CSR_ACT_CHAN_COMPL, "GA-CSR ACTIVATE CHANNEL COMPLETE" }, + { GA_MT_CSR_ACT_CHAN_FAIL, "GA-CSR ACTIVATE CHANNEL FAIL" }, + { GA_MT_CSR_CHAN_MODE_MOD, "GA-CSR CHANNEL MODE MODIFY" }, + { GA_MT_CSR_CHAN_MODE_MOD_ACK, "GA-CSR CHANNEL MODE MODIFY ACK" }, + { GA_MT_CSR_RELEASE, "GA-CSR RELEASE" }, + { GA_MT_CSR_RELEASE_COMPL, "GA-CSR RELEASE COMPLETE" }, + { GA_MT_CSR_CLEAR_REQ, "GA-CSR CLEAR REQUEST" }, + { GA_MT_CSR_HO_ACCESS, "GA-CSR HANDOVER ACCESS" }, + { GA_MT_CSR_HO_COMPL, "GA-CSR HANDOVER COMPLETE" }, + { GA_MT_CSR_UL_QUAL_IND, "GA-CSR UL QUALITY INDICATION" }, + { GA_MT_CSR_HO_INFO, "GA-CSR HANDOVER INFO" }, + { GA_MT_CSR_HO_CMD, "GA-CSR HANDOVER COMMAND" }, + { GA_MT_CSR_HO_FAIL, "GA-CSR HANDOVER FAILURE" }, + { GA_MT_CSR_PAGING_REQ, "GA-CSR PAGING REQUEST" }, + { GA_MT_CSR_PAGING_RESP, "GA-CSR PAGING RESPONSE" }, + { GA_MT_CSR_UL_DIRECT_XFER, "GA-CSR UL DIRECT TRANSFER" }, + { GA_MT_CSR_DL_DIRECT_XFER, "GA-CSR DL DIRECT TRANSFER" }, + { GA_MT_CSR_STATUS, "GA-CSR STATUS" }, + { GA_MT_RC_KEEPALIVE, "GA-CSR KEEPALIVE" }, + { GA_MT_CSR_CM_ENQ, "GA-CSR CLASSMARK ENQUIRY" }, + { GA_MT_CSR_CM_CHANGE, "GA-CSR CLASSMARK CHANGE" }, + { GA_MT_PSR_GPRS_SUSPEND_REQ, "GA-PSR GPRS SUSPEND REQUEST" }, + { GA_RC_SYNC_INFO, "GA-RC SYNCH INFORMATION" }, + { GA_CSR_UTRAN_CM_CHG, "GA-CSR UTRAN CLASSMARK CHANGE" }, + { GA_MT_CSR_REQUEST, "GA-CSR REQUEST" }, + { GA_MT_CSR_REQUEST_ACCEPT, "GA-CSR REQUEST ACCEPT" }, + { GA_MT_CSR_REQUEST_REJECT, "GA-CSR REQUEST REJECT" }, + { 0, NULL } +}; + +static const struct value_string gan_pdisc_vals[] = { + { GA_PDISC_RC, "RC" }, + { GA_PDISC_CSR, "CSR" }, + { GA_PDISC_PSR, "PSR" }, + { 0, NULL } +}; + diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4583de81a..80e1dc189 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -227,5 +227,8 @@ tlv_parse; tlv_parse_one; tvlv_att_def; +gan_msgt_vals; +gan_pdisc_vals; + local: *; };