From 59d16fcfe6b32c36fdbe64c594234fa96473dc70 Mon Sep 17 00:00:00 2001
From: Piotr Krysik <perper@o2.pl>
Date: Mon, 22 Jun 2009 17:56:04 +0200
Subject: added Harald's code for pcap output

---
 src/lib/decoder/Makefile.am | 7 ++++++-
 src/lib/decoder/gsmstack.c  | 4 ++--
 src/lib/gsm_receiver_cf.cc  | 6 ++----
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/decoder/Makefile.am b/src/lib/decoder/Makefile.am
index 3a3e3f5..1ad7899 100644
--- a/src/lib/decoder/Makefile.am
+++ b/src/lib/decoder/Makefile.am
@@ -30,6 +30,8 @@ libdecoder_la_SOURCES = \
 	cch.c 		\
 	fire_crc.c	\
 	gsmstack.c	\
+	out_pcap.c	\
+	tun.c		\
 	interleave.c
         
 noinst_HEADERS = \
@@ -38,6 +40,9 @@ noinst_HEADERS = \
 	fire_crc.h	\
 	gsmstack.h	\
 	interleave.h	\
-	system.h	
+	system.h	\
+	out_pcap.h	\
+	tun.h		\
+	gsmtap.h
 	
 #	burst_types.h 
diff --git a/src/lib/decoder/gsmstack.c b/src/lib/decoder/gsmstack.c
index a1f32d8..c3f1921 100644
--- a/src/lib/decoder/gsmstack.c
+++ b/src/lib/decoder/gsmstack.c
@@ -88,11 +88,11 @@ GS_new(GS_CTX *ctx)
 	if (ctx->tun_fd < 0)
 		fprintf(stderr, "cannot open 'gsm' tun device, did you create it?\n");
 
-	ctx->pcap_fd = open_pcap_file("tvoid.pcap");
+	ctx->pcap_fd = open_pcap_file("gsm-receiver.pcap");
 	if (ctx->pcap_fd < 0)
 		fprintf(stderr, "cannot open PCAP file: %s\n", strerror(errno));
 
-	ctx->burst_pcap_fd = open_pcap_file("tvoid-burst.pcap");
+	ctx->burst_pcap_fd = open_pcap_file("gsm-receiver-burst.pcap");
 	if (ctx->burst_pcap_fd < 0)
 		fprintf(stderr, "cannot open burst PCAP file: %s\n", strerror(errno));
 
diff --git a/src/lib/gsm_receiver_cf.cc b/src/lib/gsm_receiver_cf.cc
index e314381..2081e07 100644
--- a/src/lib/gsm_receiver_cf.cc
+++ b/src/lib/gsm_receiver_cf.cc
@@ -42,13 +42,11 @@
 void gsm_receiver_cf::process_normal_burst(burst_counter burst_nr, const unsigned char * burst_binary)
 {
    if (burst_nr.get_timeslot_nr() == 0) {
-//     std::cout  << " t2:" << burst_nr.get_t2() << " fn:" << burst_nr.get_frame_nr();
-//     printf(" burst = [ ");
+//      printf(" %2d %6x %6x", burst_nr.get_t2(), burst_nr.get_frame_nr(), burst_nr.get_frame_nr_mod());
 //     for (int i = 0; i < BURST_SIZE ; i++) {
 //       printf(" %d", burst_binary[i]);
 //     }
-//     printf("];\n");
-//     std::cout  << " t2: " << burst_nr.get_t2() << "\n";
+//     std::cout  << "\n";
 //    std::cout  << " bcc: " << d_bcc << "\n";
     GS_process(&d_gs_ctx, TIMESLOT0, 6, &burst_binary[3], burst_nr.get_frame_nr());
   }
-- 
cgit v1.2.3