Merge tag 'upstream/1.6.0'

Upstream version 1.6.0

.gitignore

@@ -0,0 +1,24 @@
+*.a
+*.d
+*.o
+*.pyc
+*.pyo
+*.so
+*~
+apps/py_sems/sip/*.cpp
+apps/py_sems/sip/*.h
+apps/py_sems/sip/Makefile.gen
+core/etc/*.conf
+core/etc/*.template
+getarch
+getos
+sems
+sems-stats
+sems-logfile-callextract
+cscope.out
+cscope.files
+semantic.cache
+apps/rtmp/flash_phone/*.swf
+core/plug-in/silk/SILK_SDK_*
+core.*
+*.patch

Makefile.defs

@@ -5,11 +5,11 @@ export makefile_defs
 
 GIT := $(shell which git)
 
-ifneq ($(GIT),)
-   SCM_REV := $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
-        then git describe --always --dirty 2>/dev/null; \
-        else git describe --always 2>/dev/null; fi)
-endif
+#ifneq ($(GIT),)
+#   SCM_REV := $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
+#        then git describe --always --dirty 2>/dev/null; \
+#        else git describe --always 2>/dev/null; fi)
+#endif
 
 #version number
 VERSION = 1

core/AmConfig.cpp

@@ -1023,6 +1023,10 @@ static bool fillSysIntfList()
   freeifaddrs(ifap);
   close(fd);
 
+  return true;
+}
+
+static void fillMissingLocalSIPIPfromSysIntfs() {
   // add addresses from SysIntfList, if not present
   for(unsigned int idx = 0; idx < AmConfig::SIP_Ifs.size(); idx++) {
 
@@ -1045,15 +1049,15 @@ static bool fillSysIntfList()
 
       if(AmConfig::LocalSIPIP2If.find(intf_it->addrs.front().addr)
 	 == AmConfig::LocalSIPIP2If.end()) {
-	
+	DBG("mapping unmapped IP address '%s' to interface #%u \n",
+	    intf_it->addrs.front().addr.c_str(), idx);
 	AmConfig::LocalSIPIP2If[intf_it->addrs.front().addr] = idx;
       }
     }
   }
-
-  return true;
 }
 
+
 /** Get the AF_INET[6] address associated with the network interface */
 string fixIface2IP(const string& dev_name, bool v6_for_sip)
 {
@@ -1195,6 +1199,8 @@ int AmConfig::finalizeIPConfig()
     RTP_If_names["default"] = 0;
   }
 
+  fillMissingLocalSIPIPfromSysIntfs();
+
   return 0;
 }
 

core/tests/Makefile

@@ -76,10 +76,13 @@ include ../../Makefile.defs
 %.d : $(SBC_DIR)%.cpp $(SBC_DIR)%.h ../../Makefile.defs
 	$(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@
 
+%.d : $(AUTH_DIR)%.cpp $(SBC_DIR)%.h ../../Makefile.defs
+	$(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@
+
 %.d : ../%.cpp ../%.h ../../Makefile.defs
 	$(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@
 
-$(NAME): $(OBJS) $(CORE_OBJS) $(SBC_OBJS) $(SIP_STACK) $(LIBRESAMPLE) ../../Makefile.defs
+$(NAME): $(OBJS) $(CORE_OBJS) $(SBC_OBJS) $(AUTH_OBJS) $(SIP_STACK) $(LIBRESAMPLE) ../../Makefile.defs
 	-@echo ""
 	-@echo "making $(NAME)"
 	$(LD) -o $(NAME) $(OBJS) $(CORE_OBJS) $(SBC_OBJS) $(SIP_STACK) $(LIBRESAMPLE) $(LDFLAGS) $(EXTRA_LDFLAGS) $(AUTH_OBJS)

pkg/deb/debian/changelog

@@ -1,3 +1,9 @@
+sems (1.6.0) unstable; urgency=low
+
+  * SEMS 1.6.0 release
+
+ -- stefan <stefan.sayer@googlemail.com>  Tue, 16 Jun 2015 13:10:56 +0200
+
 sems (1.6.0~dev) unstable; urgency=medium
 
   * Devel version

pkg/deb/jessie/changelog

@@ -1,3 +1,9 @@
+sems (1.6.0) unstable; urgency=low
+
+  * SEMS 1.6.0 release
+
+ -- stefan <stefan.sayer@googlemail.com>  Tue, 16 Jun 2015 13:10:56 +0200
+
 sems (1.6.0~dev) unstable; urgency=medium
 
   * Devel version

pkg/deb/precise/changelog

@@ -1,3 +1,9 @@
+sems (1.6.0) unstable; urgency=low
+
+  * SEMS 1.6.0 release
+
+ -- stefan <stefan.sayer@googlemail.com>  Tue, 16 Jun 2015 13:10:56 +0200
+
 sems (1.6.0~dev) unstable; urgency=medium
 
   * Devel version

pkg/deb/trusty/changelog

@@ -1,3 +1,9 @@
+sems (1.6.0) unstable; urgency=low
+
+  * SEMS 1.6.0 release
+
+ -- stefan <stefan.sayer@googlemail.com>  Tue, 16 Jun 2015 13:10:56 +0200
+
 sems (1.6.0~dev) unstable; urgency=medium
 
   * Devel version

pkg/deb/wheezy/changelog

@@ -1,3 +1,9 @@
+sems (1.6.0) unstable; urgency=low
+
+  * SEMS 1.6.0 release
+
+ -- stefan <stefan.sayer@googlemail.com>  Tue, 16 Jun 2015 13:10:56 +0200
+
 sems (1.6.0~dev) unstable; urgency=medium
 
   * Devel version