summaryrefslogtreecommitdiffstats
path: root/Src/osmolib/src/host/layer23/include/osmocom/bb/common
diff options
context:
space:
mode:
authorroot2012-02-28 14:15:19 +0100
committerroot2012-02-28 14:15:19 +0100
commit1116885d96725ce064db04604e4d197a136b163c (patch)
tree22ba472d309f1ac66918f09cc63bb9be057cf579 /Src/osmolib/src/host/layer23/include/osmocom/bb/common
parentcompiled version added (diff)
downloadimsi-catcher-detection-1116885d96725ce064db04604e4d197a136b163c.tar.gz
imsi-catcher-detection-1116885d96725ce064db04604e4d197a136b163c.tar.xz
imsi-catcher-detection-1116885d96725ce064db04604e4d197a136b163c.zip
updated codebase to latest version of osmocombb
Diffstat (limited to 'Src/osmolib/src/host/layer23/include/osmocom/bb/common')
-rw-r--r--Src/osmolib/src/host/layer23/include/osmocom/bb/common/Makefile.am2
-rw-r--r--Src/osmolib/src/host/layer23/include/osmocom/bb/common/logging.h2
-rw-r--r--Src/osmolib/src/host/layer23/include/osmocom/bb/common/networks.h2
-rw-r--r--Src/osmolib/src/host/layer23/include/osmocom/bb/common/osmocom_data.h2
-rw-r--r--Src/osmolib/src/host/layer23/include/osmocom/bb/common/sim.h10
5 files changed, 14 insertions, 4 deletions
diff --git a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/Makefile.am b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/Makefile.am
index 26e63cf..945c73d 100644
--- a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/Makefile.am
+++ b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/Makefile.am
@@ -1,2 +1,2 @@
-noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h lapdm.h logging.h \
+noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \
networks.h gps.h sysinfo.h osmocom_data.h
diff --git a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/logging.h b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/logging.h
index 554b767..3efa57a 100644
--- a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/logging.h
+++ b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/logging.h
@@ -12,11 +12,11 @@ enum {
DNB,
DMM,
DCC,
+ DSS,
DSMS,
DMNCC,
DMEAS,
DPAG,
- DLAPDM,
DL1C,
DSAP,
DSUM,
diff --git a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/networks.h b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/networks.h
index e681216..d34f316 100644
--- a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/networks.h
+++ b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/networks.h
@@ -10,7 +10,7 @@ struct gsm_networks {
};
int gsm_match_mcc(uint16_t mcc, char *imsi);
-int gsm_match_mnc(uint16_t mcc, uint8_t mnc, char *imsi);
+int gsm_match_mnc(uint16_t mcc, uint16_t mnc, char *imsi);
const char *gsm_print_mcc(uint16_t mcc);
const char *gsm_print_mnc(uint16_t mcc);
const char *gsm_get_mcc(uint16_t mcc);
diff --git a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index 8f15007..ab7c250 100644
--- a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -11,7 +11,7 @@ struct osmocom_ms;
#include <osmocom/bb/mobile/support.h>
#include <osmocom/bb/mobile/settings.h>
#include <osmocom/bb/mobile/subscriber.h>
-#include <osmocom/bb/common/lapdm.h>
+#include <osmocom/gsm/lapdm.h>
#include <osmocom/bb/common/sap_interface.h>
#include <osmocom/bb/mobile/gsm48_rr.h>
#include <osmocom/bb/common/sysinfo.h>
diff --git a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/sim.h b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/sim.h
index a676b92..95d2147 100644
--- a/Src/osmolib/src/host/layer23/include/osmocom/bb/common/sim.h
+++ b/Src/osmolib/src/host/layer23/include/osmocom/bb/common/sim.h
@@ -266,6 +266,16 @@ struct gsm1111_ef_adn {
uint8_t ext_id;
} __attribute__ ((packed));
+/* Section 10.5.6 */
+struct gsm1111_ef_smsp {
+ uint8_t par_ind;
+ uint8_t tp_da[12];
+ uint8_t ts_sca[12];
+ uint8_t tp_proto;
+ uint8_t tp_dcs;
+ uint8_t tp_vp;
+} __attribute__ ((packed));
+
int sim_apdu_resp(struct osmocom_ms *ms, struct msgb *msg);
int gsm_sim_init(struct osmocom_ms *ms);
int gsm_sim_exit(struct osmocom_ms *ms);