summaryrefslogtreecommitdiffstats
path: root/Src/osmolib/src
diff options
context:
space:
mode:
authorTom2012-05-28 22:48:08 +0200
committerTom2012-05-28 22:48:08 +0200
commitded6b56b3c24ec2f1fc1544c4bc872c71e54c99f (patch)
tree37aae445e53e2d0ba90fee7a1a8234443d826649 /Src/osmolib/src
parentpaging image added (diff)
downloadimsi-catcher-detection-ded6b56b3c24ec2f1fc1544c4bc872c71e54c99f.tar.gz
imsi-catcher-detection-ded6b56b3c24ec2f1fc1544c4bc872c71e54c99f.tar.xz
imsi-catcher-detection-ded6b56b3c24ec2f1fc1544c4bc872c71e54c99f.zip
some more tex changes and experiments
Diffstat (limited to 'Src/osmolib/src')
-rw-r--r--Src/osmolib/src/host/layer23/src/misc/Makefile.am4
-rwxr-xr-xSrc/osmolib/src/host/layer23/src/misc/pch_scan (renamed from Src/osmolib/src/host/layer23/src/misc/enc_scan)bin896781 -> 892996 bytes
-rw-r--r--Src/osmolib/src/host/layer23/src/misc/pch_scan.c (renamed from Src/osmolib/src/host/layer23/src/misc/enc_scan.c)15
3 files changed, 10 insertions, 9 deletions
diff --git a/Src/osmolib/src/host/layer23/src/misc/Makefile.am b/Src/osmolib/src/host/layer23/src/misc/Makefile.am
index 8e9d7f6..8e74dea 100644
--- a/Src/osmolib/src/host/layer23/src/misc/Makefile.am
+++ b/Src/osmolib/src/host/layer23/src/misc/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS)
-bin_PROGRAMS = bcch_scan ccch_scan echo_test enc_scan cell_log catcher cbch_sniff
+bin_PROGRAMS = bcch_scan ccch_scan echo_test pch_scan cell_log catcher cbch_sniff
bcch_scan_SOURCES = ../common/main.c app_bcch_scan.c bcch_scan.c
ccch_scan_SOURCES = ../common/main.c app_ccch_scan.c rslms.c
echo_test_SOURCES = ../common/main.c app_echo_test.c
-enc_scan_SOURCES = ../common/main.c enc_scan.c rslms.c
+pch_scan_SOURCES = ../common/main.c pch_scan.c rslms.c
cell_log_LDADD = $(LDADD) -lm
cell_log_SOURCES = ../common/main.c app_cell_log.c cell_log.c \
../../../gsmmap/geo.c
diff --git a/Src/osmolib/src/host/layer23/src/misc/enc_scan b/Src/osmolib/src/host/layer23/src/misc/pch_scan
index 3b26c35..b271ff5 100755
--- a/Src/osmolib/src/host/layer23/src/misc/enc_scan
+++ b/Src/osmolib/src/host/layer23/src/misc/pch_scan
Binary files differ
diff --git a/Src/osmolib/src/host/layer23/src/misc/enc_scan.c b/Src/osmolib/src/host/layer23/src/misc/pch_scan.c
index bfba4ed..7f3e271 100644
--- a/Src/osmolib/src/host/layer23/src/misc/enc_scan.c
+++ b/Src/osmolib/src/host/layer23/src/misc/pch_scan.c
@@ -224,16 +224,17 @@ static int gsm48_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms)
arfcn = ia->chan_desc.h0.arfcn_low | (ia->chan_desc.h0.arfcn_high << 8);
- LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS (ra=0x%02x, chan_nr=0x%02x, "
+ LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS NONHOP (ra=0x%02x, chan_nr=0x%02x, "
"ARFCN=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra,
ia->chan_desc.chan_nr, arfcn, ch_ts, ch_subch,
ia->chan_desc.h0.tsc);
/* request L1 to go to dedicated mode on assigned channel */
-
+ /*
rv = l1ctl_tx_dm_est_req_h0(ms,
arfcn, ia->chan_desc.chan_nr, ia->chan_desc.h0.tsc,
GSM48_CMODE_SIGN,0);
+ */
} else {
@@ -245,7 +246,7 @@ static int gsm48_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms)
hsn = ia->chan_desc.h1.hsn;
maio = ia->chan_desc.h1.maio_low | (ia->chan_desc.h1.maio_high << 2);
- LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS (ra=0x%02x, chan_nr=0x%02x, "
+ LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS HOP (ra=0x%02x, chan_nr=0x%02x, "
"HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra,
ia->chan_desc.chan_nr, hsn, maio, ch_ts, ch_subch,
ia->chan_desc.h1.tsc);
@@ -263,19 +264,19 @@ static int gsm48_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms)
}
}
/* request L1 to go to dedicated mode on assigned channel */
-
+ /*
rv = l1ctl_tx_dm_est_req_h1(ms,
maio, hsn, ma, ma_len,
ia->chan_desc.chan_nr, ia->chan_desc.h1.tsc,
GSM48_CMODE_SIGN,0);
-
+ */
}
LOGPC(DRR, LOGL_NOTICE, "\n");
- rv = gsm48_tx_loc_upd_req(ms, ia->chan_desc.chan_nr);
+ //rv = gsm48_tx_loc_upd_req(ms, ia->chan_desc.chan_nr);
- return rv;
+ //return rv;
return 0;
}