Drop TUN/TAP in favour of p25 in UDP encapsulation.
git-svn-id: http://op25.osmocom.org/svn/trunk@249 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
stevie
parent
0236de053a
commit
f03a0c623a
|
|
@ -69,8 +69,8 @@ _op25_la_SOURCES = \
|
|||
tsbk.cc \
|
||||
data_unit_handler.cc \
|
||||
logfile_du_handler.cc \
|
||||
p25cai_du_handler.cc \
|
||||
snapshot_du_handler.cc \
|
||||
sniffer_du_handler.cc \
|
||||
imbe_decoder.cc \
|
||||
imbe_decoder_factory.cc \
|
||||
dummy_imbe_decoder.cc \
|
||||
|
|
@ -81,7 +81,10 @@ _op25_la_SOURCES = \
|
|||
op25_decoder_ff.cc \
|
||||
software_imbe_decoder.cc \
|
||||
vc55_imbe_decoder.cc \
|
||||
value_string.cc
|
||||
value_string.cc \
|
||||
pickle.cc \
|
||||
golay.cc \
|
||||
hamming.cc
|
||||
|
||||
# magic flags
|
||||
_op25_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
|
||||
|
|
@ -98,12 +101,7 @@ op25.cc op25.py: $(LOCAL_IFILES) $(ALL_IFILES)
|
|||
|
||||
# These headers get installed in ${prefix}/include/gnuradio
|
||||
grinclude_HEADERS = \
|
||||
op25_decoder_ff.h \
|
||||
op25_p25_frame.h \
|
||||
op25_imbe_frame.h \
|
||||
op25_golay.h \
|
||||
op25_hamming.h \
|
||||
op25_yank.h
|
||||
op25_decoder_ff.h
|
||||
|
||||
# These swig headers get installed in ${prefix}/include/gnuradio/swig
|
||||
swiginclude_HEADERS = \
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
* First arg is the package prefix.
|
||||
* Second arg is the name of the class minus the prefix.
|
||||
*
|
||||
* This does some behind-the-scenes magic so we can access
|
||||
* op25_decoder_ff from python as op25.decoder_ff.
|
||||
* This does some behind-the-scenes magic so we can invoke
|
||||
* op25_make_decoder_ff from python as op25.decoder_ff.
|
||||
*/
|
||||
GR_SWIG_BLOCK_MAGIC(op25, decoder_ff);
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ class op25_decoder_ff : public gr_block
|
|||
private:
|
||||
op25_decoder_ff();
|
||||
public:
|
||||
const char *device_name() const;
|
||||
const char *destination() const;
|
||||
gr_msg_queue_sptr get_msgq() const;
|
||||
void set_msgq(gr_msg_queue_sptr msgq);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* -*- C++ -*- */
|
||||
|
||||
/*
|
||||
* Copyright 2008, 2009 Steve Glass
|
||||
* Copyright 2008-2011 Steve Glass
|
||||
*
|
||||
* This file is part of OP25.
|
||||
*
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#include <offline_imbe_decoder.h>
|
||||
#include <op25_decoder_ff.h>
|
||||
#include <snapshot_du_handler.h>
|
||||
#include <sniffer_du_handler.h>
|
||||
#include <p25cai_du_handler.h>
|
||||
#include <voice_du_handler.h>
|
||||
#include <op25_yank.h>
|
||||
|
||||
|
|
@ -56,6 +56,7 @@ op25_decoder_ff::get_msgq() const
|
|||
}
|
||||
|
||||
void
|
||||
|
||||
op25_decoder_ff::set_msgq(gr_msg_queue_sptr msgq)
|
||||
{
|
||||
d_snapshot_du_handler->set_msgq(msgq);
|
||||
|
|
@ -117,9 +118,9 @@ op25_decoder_ff::general_work(int nof_output_items, gr_vector_int& nof_input_ite
|
|||
}
|
||||
|
||||
const char*
|
||||
op25_decoder_ff::device_name() const
|
||||
op25_decoder_ff::destination() const
|
||||
{
|
||||
return d_sniffer_du_handler->device_name();
|
||||
return d_p25cai_du_handler->destination();
|
||||
}
|
||||
|
||||
op25_decoder_ff::op25_decoder_ff() :
|
||||
|
|
@ -129,10 +130,10 @@ op25_decoder_ff::op25_decoder_ff() :
|
|||
d_frame_hdr(),
|
||||
d_imbe(imbe_decoder::make()),
|
||||
d_state(SYNCHRONIZING),
|
||||
d_sniffer_du_handler(NULL)
|
||||
d_p25cai_du_handler(NULL)
|
||||
{
|
||||
d_sniffer_du_handler = new sniffer_du_handler(d_data_unit_handler);
|
||||
d_data_unit_handler = data_unit_handler_sptr(d_sniffer_du_handler);
|
||||
d_p25cai_du_handler = new p25cai_du_handler(d_data_unit_handler, "224.0.0.1", 23456);
|
||||
d_data_unit_handler = data_unit_handler_sptr(d_p25cai_du_handler);
|
||||
d_snapshot_du_handler = new snapshot_du_handler(d_data_unit_handler);
|
||||
d_data_unit_handler = data_unit_handler_sptr(d_snapshot_du_handler);
|
||||
d_data_unit_handler = data_unit_handler_sptr(new voice_du_handler(d_data_unit_handler, d_imbe));
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* -*- C++ -*- */
|
||||
|
||||
/*
|
||||
* Copyright 2008 Steve Glass
|
||||
* Copyright 2008-2011 Steve Glass
|
||||
*
|
||||
* This file is part of OP25.
|
||||
*
|
||||
|
|
@ -59,14 +59,13 @@ public:
|
|||
* Process symbols into frames.
|
||||
*/
|
||||
virtual int general_work(int nof_output_items, gr_vector_int& nof_input_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items);
|
||||
|
||||
/**
|
||||
* Return a pointer to a string naming the device to which packets
|
||||
* are forwarded.
|
||||
* Return a pointer to a string identifying the destination of
|
||||
* the received frames.
|
||||
*
|
||||
* \return A pointer to a NUL-terminated character string.
|
||||
*/
|
||||
const char *device_name() const;
|
||||
const char *destination() const;
|
||||
|
||||
/**
|
||||
* Accessor for the msgq attribute. Returns a pointer to the msgq
|
||||
|
|
@ -155,9 +154,9 @@ private:
|
|||
enum { SYNCHRONIZING, IDENTIFYING, READING } d_state;
|
||||
|
||||
/**
|
||||
* The sniffer (TUN/TAP) data unit handler.
|
||||
* The p25cai (TUN/TAP) data unit handler.
|
||||
*/
|
||||
class sniffer_du_handler *d_sniffer_du_handler;
|
||||
class p25cai_du_handler *d_p25cai_du_handler;
|
||||
|
||||
/**
|
||||
* The snapshot data unit handler.
|
||||
|
|
|
|||
Reference in New Issue