diff options
Diffstat (limited to 'src/shared/libosmocore/src')
| -rw-r--r-- | src/shared/libosmocore/src/gb/Makefile.am | 2 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gb/gprs_ns_frgre.c | 2 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gsm/Makefile.am | 2 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gsm/gsm0411_smc.c | 6 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gsm/gsm0411_smr.c | 6 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gsm/gsm0411_utils.c | 1 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gsm/gsm48.c | 4 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/vty/logging_vty.c | 6 |
8 files changed, 19 insertions, 10 deletions
diff --git a/src/shared/libosmocore/src/gb/Makefile.am b/src/shared/libosmocore/src/gb/Makefile.am index c1377665..04d21085 100644 --- a/src/shared/libosmocore/src/gb/Makefile.am +++ b/src/shared/libosmocore/src/gb/Makefile.am @@ -11,7 +11,7 @@ noinst_HEADERS = common_vty.h if ENABLE_GB lib_LTLIBRARIES = libosmogb.la -libosmogb_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libosmogb.map -version-info $(LIBVERSION) +libosmogb_la_LDFLAGS = $(LTLDFLAGS_OSMOGB) -version-info $(LIBVERSION) libosmogb_la_LIBADD = \ $(top_builddir)/src/libosmocore.la \ $(top_builddir)/src/vty/libosmovty.la \ diff --git a/src/shared/libosmocore/src/gb/gprs_ns_frgre.c b/src/shared/libosmocore/src/gb/gprs_ns_frgre.c index 23443812..e557c7e8 100644 --- a/src/shared/libosmocore/src/gb/gprs_ns_frgre.c +++ b/src/shared/libosmocore/src/gb/gprs_ns_frgre.c @@ -48,7 +48,7 @@ struct gre_hdr { uint16_t ptype; } __attribute__ ((packed)); -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__APPLE__) /** * On BSD the IPv4 struct is called struct ip and instead of iXX * the members are called ip_XX. One could change this code to use diff --git a/src/shared/libosmocore/src/gsm/Makefile.am b/src/shared/libosmocore/src/gsm/Makefile.am index b72a8d43..0544e0a1 100644 --- a/src/shared/libosmocore/src/gsm/Makefile.am +++ b/src/shared/libosmocore/src/gsm/Makefile.am @@ -21,7 +21,7 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c gsm_utils.c \ milenage/aes-encblock.c milenage/aes-internal.c \ milenage/aes-internal-enc.c milenage/milenage.c gan.c -libosmogsm_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libosmogsm.map -version-info $(LIBVERSION) +libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la EXTRA_DIST = libosmogsm.map diff --git a/src/shared/libosmocore/src/gsm/gsm0411_smc.c b/src/shared/libosmocore/src/gsm/gsm0411_smc.c index 54e6129c..4152ef1c 100644 --- a/src/shared/libosmocore/src/gsm/gsm0411_smc.c +++ b/src/shared/libosmocore/src/gsm/gsm0411_smc.c @@ -140,7 +140,7 @@ static int gsm411_tx_cp_error(struct gsm411_smc_inst *inst, uint8_t cause) GSM411_MT_CP_ERROR); } -/* etablish SMC connection */ +/* establish SMC connection */ static int gsm411_mnsms_est_req(struct gsm411_smc_inst *inst, struct msgb *msg) { struct msgb *nmsg; @@ -303,7 +303,9 @@ static int gsm411_mnsms_rel_req(struct gsm411_smc_inst *inst, struct msgb *msg) /* store release, until established or released */ if (inst->cp_state != GSM411_CPS_MM_ESTABLISHED) { - LOGP(DLSMS, LOGL_NOTICE, "Cannot release yet.\n"); + LOGP(DLSMS, LOGL_NOTICE, + "Cannot release yet current state: %s\n", + smc_state_names[inst->cp_state]); inst->cp_rel = 1; return 0; } diff --git a/src/shared/libosmocore/src/gsm/gsm0411_smr.c b/src/shared/libosmocore/src/gsm/gsm0411_smr.c index d5ca9238..7dd8f723 100644 --- a/src/shared/libosmocore/src/gsm/gsm0411_smr.c +++ b/src/shared/libosmocore/src/gsm/gsm0411_smr.c @@ -172,7 +172,7 @@ static int gsm411_send_release(struct gsm411_smr_inst *inst) { struct msgb *msg = gsm411_msgb_alloc(); - LOGP(DLSMS, LOGL_NOTICE, "TX: MNSMS-REL-REQ\n"); + LOGP(DLSMS, LOGL_DEBUG, "TX: MNSMS-REL-REQ\n"); return inst->mn_send(inst, GSM411_MNSMS_REL_REQ, msg); } @@ -182,7 +182,7 @@ static int gsm411_send_abort(struct gsm411_smr_inst *inst) struct msgb *msg = gsm411_msgb_alloc(); msgb_tv_put(msg, 1, 111); //FIXME: better idea ? */ - LOGP(DLSMS, LOGL_NOTICE, "TX: MNSMS-ABORT-REQ\n"); + LOGP(DLSMS, LOGL_DEBUG, "TX: MNSMS-ABORT-REQ\n"); return inst->mn_send(inst, GSM411_MNSMS_ABORT_REQ, msg); } @@ -191,7 +191,7 @@ static int gsm411_send_report(struct gsm411_smr_inst *inst) { struct msgb *msg = gsm411_msgb_alloc(); - LOGP(DLSMS, LOGL_NOTICE, "send empty SM_RL_REPORT_IND\n"); + LOGP(DLSMS, LOGL_DEBUG, "Sending empty SM_RL_REPORT_IND\n"); return inst->rl_recv(inst, GSM411_SM_RL_REPORT_IND, msg); } diff --git a/src/shared/libosmocore/src/gsm/gsm0411_utils.c b/src/shared/libosmocore/src/gsm/gsm0411_utils.c index ebde8fca..fe69bf41 100644 --- a/src/shared/libosmocore/src/gsm/gsm0411_utils.c +++ b/src/shared/libosmocore/src/gsm/gsm0411_utils.c @@ -273,7 +273,6 @@ int gsm340_gen_oa(uint8_t *oa, unsigned int oa_len, uint8_t type, if (strlen(number) > 20) number = ""; -// oa[1] = 0xb9; /* networks-specific number, private numbering plan */ oa[1] = 0x80 | (type << 4) | plan; len_in_bytes = gsm48_encode_bcd_number(oa, oa_len, 1, number); diff --git a/src/shared/libosmocore/src/gsm/gsm48.c b/src/shared/libosmocore/src/gsm/gsm48.c index fe62dee7..ea05d450 100644 --- a/src/shared/libosmocore/src/gsm/gsm48.c +++ b/src/shared/libosmocore/src/gsm/gsm48.c @@ -416,6 +416,7 @@ int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid) { uint16_t mcc = raid->mcc; uint16_t mnc = raid->mnc; + uint16_t _lac; buf[0] = ((mcc / 100) % 10) | (((mcc / 10) % 10) << 4); buf[1] = (mcc % 10); @@ -430,7 +431,8 @@ int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid) buf[2] = ((mnc / 100) % 10) | (((mnc / 10) % 10) << 4); } - *(uint16_t *)(buf+3) = htons(raid->lac); + _lac = htons(raid->lac); + memcpy(buf + 3, &_lac, 2); buf[5] = raid->rac; diff --git a/src/shared/libosmocore/src/vty/logging_vty.c b/src/shared/libosmocore/src/vty/logging_vty.c index 6166f1f2..d473f129 100644 --- a/src/shared/libosmocore/src/vty/logging_vty.c +++ b/src/shared/libosmocore/src/vty/logging_vty.c @@ -535,6 +535,10 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt) break; } + vty_out(vty, " logging filter all %u%s", + tgt->filter_map & LOG_FILTER_ALL ? 1 : 0, VTY_NEWLINE); + /* FIXME: how to do this for filters outside of libosmocore? */ + vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0, VTY_NEWLINE); vty_out(vty, " logging timestamp %u%s", tgt->print_timestamp ? 1 : 0, @@ -588,6 +592,8 @@ void logging_vty_add_cmds(const struct log_info *cat) install_element_ve(&show_logging_vty_cmd); install_node(&cfg_log_node, config_write_log); + install_default(CFG_LOG_NODE); + install_element(CFG_LOG_NODE, &config_end_cmd); install_element(CFG_LOG_NODE, &logging_fltr_all_cmd); install_element(CFG_LOG_NODE, &logging_use_clr_cmd); install_element(CFG_LOG_NODE, &logging_prnt_timestamp_cmd); |