Merge commit '5905d5be60249b2d9ca9abce4c801bc3bceed6d9'

4 files changed, 10 insertions, 8 deletions

diff --git a/src/shared/libosmocore/include/osmocom/core/msgb.h b/src/shared/libosmocore/include/osmocom/core/msgb.h
index 36c7c0f9..a1939ab6 100644
--- a/src/shared/libosmocore/include/osmocom/core/msgb.h
+++ b/src/shared/libosmocore/include/osmocom/core/msgb.h
@@ -305,7 +305,7 @@ static inline unsigned char *msgb_pull(struct msgb *msgb, unsigned int len)
  */
 static inline uint8_t msgb_pull_u8(struct msgb *msgb)
 {
-	uint8_t *space = msgb_pull(msgb, 1);
+	uint8_t *space = msgb_pull(msgb, 1) - 1;
 	return space[0];
 }
 /*! \brief remove uint16 from front of message
@@ -314,7 +314,7 @@ static inline uint8_t msgb_pull_u8(struct msgb *msgb)
  */
 static inline uint16_t msgb_pull_u16(struct msgb *msgb)
 {
-	uint8_t *space = msgb_pull(msgb, 2);
+	uint8_t *space = msgb_pull(msgb, 2) - 2;
 	return space[0] << 8 | space[1];
 }
 /*! \brief remove uint32 from front of message
@@ -323,7 +323,7 @@ static inline uint16_t msgb_pull_u16(struct msgb *msgb)
  */
 static inline uint32_t msgb_pull_u32(struct msgb *msgb)
 {
-	uint8_t *space = msgb_pull(msgb, 4);
+	uint8_t *space = msgb_pull(msgb, 4) - 4;
 	return space[0] << 24 | space[1] << 16 | space[2] << 8 | space[3];
 }
 
diff --git a/src/shared/libosmocore/include/osmocom/gsm/abis_nm.h b/src/shared/libosmocore/include/osmocom/gsm/abis_nm.h
index cc017650..320ac3e5 100644
--- a/src/shared/libosmocore/include/osmocom/gsm/abis_nm.h
+++ b/src/shared/libosmocore/include/osmocom/gsm/abis_nm.h
@@ -14,10 +14,10 @@
 enum abis_nm_msgtype;
 enum gsm_phys_chan_config;
 
-const enum abis_nm_msgtype abis_nm_reports[4];
-const enum abis_nm_msgtype abis_nm_no_ack_nack[3];
-const enum abis_nm_msgtype abis_nm_sw_load_msgs[9];
-const enum abis_nm_msgtype abis_nm_nacks[33];
+extern const enum abis_nm_msgtype abis_nm_reports[4];
+extern const enum abis_nm_msgtype abis_nm_no_ack_nack[3];
+extern const enum abis_nm_msgtype abis_nm_sw_load_msgs[9];
+extern const enum abis_nm_msgtype abis_nm_nacks[33];
 
 extern const struct value_string abis_nm_obj_class_names[];
 extern const struct value_string abis_nm_adm_state_names[];
@@ -26,7 +26,7 @@ const char *abis_nm_nack_cause_name(uint8_t cause);
 const char *abis_nm_nack_name(uint8_t nack);
 const char *abis_nm_event_type_name(uint8_t cause);
 const char *abis_nm_severity_name(uint8_t cause);
-const struct tlv_definition abis_nm_att_tlvdef;
+extern const struct tlv_definition abis_nm_att_tlvdef;
 const char *abis_nm_opstate_name(uint8_t os);
 const char *abis_nm_avail_name(uint8_t avail);
 const char *abis_nm_test_name(uint8_t test);
diff --git a/src/shared/libosmocore/include/osmocom/gsm/gsm0411_smc.h b/src/shared/libosmocore/include/osmocom/gsm/gsm0411_smc.h
index e1508a2d..2140db43 100644
--- a/src/shared/libosmocore/include/osmocom/gsm/gsm0411_smc.h
+++ b/src/shared/libosmocore/include/osmocom/gsm/gsm0411_smc.h
@@ -1,6 +1,7 @@
 #ifndef _GSM0411_SMC_H
 #define _GSM0411_SMC_H
 
+#include <osmocom/core/timer.h>
 #include <osmocom/gsm/protocol/gsm_04_11.h>
 
 #define GSM411_MMSMS_EST_REQ		0x310
diff --git a/src/shared/libosmocore/include/osmocom/vty/command.h b/src/shared/libosmocore/include/osmocom/vty/command.h
index caafdeb5..8fbb4824 100644
--- a/src/shared/libosmocore/include/osmocom/vty/command.h
+++ b/src/shared/libosmocore/include/osmocom/vty/command.h
@@ -361,6 +361,7 @@ void cmd_init(int);
 extern struct cmd_element config_exit_cmd;
 extern struct cmd_element config_help_cmd;
 extern struct cmd_element config_list_cmd;
+extern struct cmd_element config_end_cmd;
 char *host_config_file();
 void host_config_set(const char *);