diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/e1_recorder.c | 11 | ||||
-rw-r--r-- | src/e1cap_dump.c | 7 | ||||
-rw-r--r-- | src/flip_bits.c | 7 | ||||
-rw-r--r-- | src/flip_bits.h | 2 |
4 files changed, 16 insertions, 11 deletions
diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 333375d..cc21bc0 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -77,6 +77,7 @@ void e1ts_raw_recv(struct e1inp_ts *ts, struct msgb *msg) if (rline->mirror.enabled) { struct e1inp_line *other_line = e1inp_line_find(rline->mirror.line_nr); + OSMO_ASSERT(other_line); struct e1inp_ts *other_ts; other_ts = &other_line->ts[ts->num-1]; if (!other_ts) { @@ -187,7 +188,7 @@ int main(int argc, char **argv) osmo_init_logging2(rec_tall_ctx, &info); vty_init(&vty_info); - logging_vty_add_cmds(&info); + logging_vty_add_cmds(); osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); libosmo_abis_init(rec_tall_ctx); e1inp_vty_init(); @@ -207,8 +208,12 @@ int main(int argc, char **argv) exit(1); } - /* start telne tafte reading config for vty_get_bind_adr() */ - telnet_init_dynif(rec_tall_ctx, NULL, vty_get_bind_addr(), 4444); + /* start telnet after reading config */ + rc = telnet_init_default(rec_tall_ctx, NULL, 4444); + if (rc < 0) { + fprintf(stderr, "Cannot open telnet server port: %s\n", strerror(errno)); + exit(1); + } while (1) { osmo_select_main(0); diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index bcb4916..4cc8538 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -153,11 +153,12 @@ static void handle_sc_in(struct osmo_e1cap_pkthdr *pkt, const uint8_t *data, uns } -static void handle_data(struct osmo_e1cap_pkthdr *pkt, uint8_t *data, int len) +static void handle_data(struct osmo_e1cap_pkthdr *pkt, const uint8_t *idata, int len) { + uint8_t data[len]; struct timeval tv; - flip_buf_bits(data, len); + flip_buf_bits(data, idata, len); #if 0 /* filter out all-ff/all-fe/all-7f */ if (all_bytes_are(0xff, data, len) || @@ -193,7 +194,7 @@ static void handle_data(struct osmo_e1cap_pkthdr *pkt, uint8_t *data, int len) } } -static int subch_demux_out_cb(struct subch_demux *dmx, int ch, uint8_t *data, +static int subch_demux_out_cb(struct subch_demux *dmx, int ch, const ubit_t *data, int len, void *c) { OSMO_ASSERT(ch == g_filter_subslot); diff --git a/src/flip_bits.c b/src/flip_bits.c index f33994e..6b382ed 100644 --- a/src/flip_bits.c +++ b/src/flip_bits.c @@ -16,14 +16,13 @@ void init_flip_bits(void) } } -uint8_t *flip_buf_bits(uint8_t *buf, int len) +uint8_t *flip_buf_bits(uint8_t *out, const uint8_t *in, int len) { int i; - uint8_t *start = buf; for (i = 0 ; i < len; i++) { - buf[i] = flip_table[(uint8_t)buf[i]]; + out[i] = flip_table[(uint8_t)in[i]]; } - return start; + return out; } diff --git a/src/flip_bits.h b/src/flip_bits.h index 319a181..249e45b 100644 --- a/src/flip_bits.h +++ b/src/flip_bits.h @@ -1,4 +1,4 @@ #pragma once void init_flip_bits(void); -uint8_t *flip_buf_bits(uint8_t * buf , int len); +uint8_t *flip_buf_bits(uint8_t *out, const uint8_t *in, int len); |