Merge commit 'b8d18f32a1676f05d73bc9d94eadeaf5cc43c9a5'

3 files changed, 80 insertions, 1 deletions

diff --git a/src/shared/libosmocore/include/osmocom/core/logging.h b/src/shared/libosmocore/include/osmocom/core/logging.h
index 989228b9..655f7a44 100644
--- a/src/shared/libosmocore/include/osmocom/core/logging.h
+++ b/src/shared/libosmocore/include/osmocom/core/logging.h
@@ -101,7 +101,7 @@ struct log_info {
 	log_filter *filter_fn;
 
 	/*! \brief per-category information */
-	struct log_info_cat *cat;
+	const struct log_info_cat *cat;
 	/*! \brief total number of categories */
 	unsigned int num_cat;
 	/*! \brief total number of user categories (not library) */
@@ -134,6 +134,8 @@ struct log_target {
 	unsigned int use_color:1;
 	/*! \brief should log messages be prefixed with a timestamp? */
 	unsigned int print_timestamp:1;
+	/*! \brief should log messages be prefixed with a filename? */
+	unsigned int print_filename:1;
 
 	/*! \brief the type of this log taget */
 	enum log_target_type type;
@@ -179,6 +181,7 @@ void log_set_all_filter(struct log_target *target, int);
 
 void log_set_use_color(struct log_target *target, int);
 void log_set_print_timestamp(struct log_target *target, int);
+void log_set_print_filename(struct log_target *target, int);
 void log_set_log_level(struct log_target *target, int log_level);
 void log_parse_category_mask(struct log_target *target, const char* mask);
 int log_parse_level(const char *lvl);
diff --git a/src/shared/libosmocore/include/osmocom/gprs/gprs_bssgp_bss.h b/src/shared/libosmocore/include/osmocom/gprs/gprs_bssgp_bss.h
new file mode 100644
index 00000000..f34281e3
--- /dev/null
+++ b/src/shared/libosmocore/include/osmocom/gprs/gprs_bssgp_bss.h
@@ -0,0 +1,75 @@
+#ifndef _BSSGP_BSS_H
+#define _BSSGP_BSS_H
+
+#include <osmocom/core/msgb.h>
+#include <osmocom/gprs/gprs_bssgp.h>
+
+/* GPRS BSSGP protocol implementation as per 3GPP TS 08.18 */
+
+/* (C) 2009-2012 by Harald Welte <laforge@gnumonks.org>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+uint8_t *bssgp_msgb_tlli_put(struct msgb *msg, uint32_t tlli);
+
+int bssgp_tx_suspend(uint16_t nsei, uint32_t tlli,
+		     const struct gprs_ra_id *ra_id);
+
+int bssgp_tx_resume(uint16_t nsei, uint32_t tlli,
+		    const struct gprs_ra_id *ra_id, uint8_t suspend_ref);
+
+int bssgp_tx_ra_capa_upd(struct bssgp_bvc_ctx *bctx, uint32_t tlli, uint8_t tag);
+
+int bssgp_tx_radio_status_tlli(struct bssgp_bvc_ctx *bctx, uint8_t cause,
+				uint32_t tlli);
+
+int bssgp_tx_radio_status_tmsi(struct bssgp_bvc_ctx *bctx, uint8_t cause,
+				uint32_t tmsi);
+
+int bssgp_tx_radio_status_imsi(struct bssgp_bvc_ctx *bctx, uint8_t cause,
+				const char *imsi);
+
+int bssgp_tx_flush_ll_ack(struct bssgp_bvc_ctx *bctx, uint32_t tlli,
+			   uint8_t action, uint16_t bvci_new,
+			   uint32_t num_octets);
+
+int bssgp_tx_llc_discarded(struct bssgp_bvc_ctx *bctx, uint32_t tlli,
+			   uint8_t num_frames, uint32_t num_octets);
+
+int bssgp_tx_bvc_block(struct bssgp_bvc_ctx *bctx, uint8_t cause);
+
+int bssgp_tx_bvc_unblock(struct bssgp_bvc_ctx *bctx);
+
+int bssgp_tx_bvc_reset(struct bssgp_bvc_ctx *bctx, uint16_t bvci, uint8_t cause);
+
+int bssgp_tx_ul_ud(struct bssgp_bvc_ctx *bctx, uint32_t tlli,
+		   const uint8_t *qos_profile, struct msgb *llc_pdu);
+
+int bssgp_rx_paging(struct bssgp_paging_info *pinfo,
+		    struct msgb *msg);
+
+int bssgp_tx_fc_bvc(struct bssgp_bvc_ctx *bctx, uint8_t tag,
+		    uint32_t bucket_size, uint32_t bucket_leak_rate,
+		    uint16_t bmax_default_ms, uint32_t r_default_ms,
+		    uint8_t *bucket_full_ratio, uint32_t *queue_delay_ms);
+
+int bssgp_tx_fc_ms(struct bssgp_bvc_ctx *bctx, uint32_t tlli, uint8_t tag,
+		   uint32_t ms_bucket_size, uint32_t bucket_leak_rate,
+		   uint8_t *bucket_full_ratio);
+#endif
diff --git a/src/shared/libosmocore/include/osmocom/vty/misc.h b/src/shared/libosmocore/include/osmocom/vty/misc.h
index e64aec79..db4f4a77 100644
--- a/src/shared/libosmocore/include/osmocom/vty/misc.h
+++ b/src/shared/libosmocore/include/osmocom/vty/misc.h
@@ -3,6 +3,7 @@
 
 #include <osmocom/vty/vty.h>
 #include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/utils.h>
 
 #define VTY_DO_LOWER		1
 char *vty_cmd_string_from_valstr(void *ctx, const struct value_string *vals,