Merge branch 'develop' of http://git.opensource5g.org/openxg/smf into develop

build/scripts/build_helper.fb_folly

@@ -92,7 +92,11 @@ install_fb_folly_from_source(){
         libdwarf-dev
       ret=$?;[[ $ret -ne 0 ]] && return $ret
       
-      wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz && \
+     # wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz && \
+      cd /tmp
+      git clone http://git.opensource5g.org/openxg/openxg-cnlibs.git
+      cd /tmp/openxg-cnlibs
+	
       tar zxf release-1.8.0.tar.gz && \
       rm -f release-1.8.0.tar.gz && \
       cd googletest-release-1.8.0 && \
@@ -105,7 +109,8 @@ install_fb_folly_from_source(){
 
     
     $SUDO rm -rf /tmp/folly
-    git clone https://github.com/facebook/folly.git
+   # git clone https://github.com/facebook/folly.git
+   git clone http://git.opensource5g.org/openxg/folly.git
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     cd folly
     if [[ "$OS_BASEDISTRO" == "fedora" ]]; then

build/scripts/build_helper.libconfig

@@ -78,7 +78,8 @@ install_libconfig_from_source(){
 
     pushd /tmp
     $SUDO rm -rf /tmp/libconfig
-    git clone https://github.com/hyperrealm/libconfig.git
+    #git clone https://github.com/hyperrealm/libconfig.git
+    git clone http://git.opensource5g.org/openxg/libconfig.git
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     cd libconfig
     autoreconf -fi

build/scripts/build_helper.smf

@@ -52,7 +52,8 @@ install_fmt() {
     cd /tmp
     echo "Downloading fmt"
     $SUDO rm -rf /tmp/fmt*
-    git clone https://github.com/fmtlib/fmt.git
+    #git clone https://github.com/fmtlib/fmt.git
+    git clone http://git.opensource5g.org/openxg/fmt.git
     ret=$?;[[ $ret -ne 0 ]] && return $ret
     cd fmt
     # Looks like since Nov 11 commits, we cannot build
@@ -88,7 +89,8 @@ install_spdlog_from_git() {
 
   if [[ $prompt =~ [yY](es)* ]]
   then
-    GIT_URL=https://github.com/gabime/spdlog.git
+    #GIT_URL=https://github.com/gabime/spdlog.git
+    GIT_URL=http://git.opensource5g.org/openxg/spdlog.git
     echo "Install spdlog from $GIT_URL"
     pushd $OPENAIRCN_DIR/build/ext
     echo "Downloading spdlog"
@@ -127,7 +129,8 @@ install_pistache_from_git() {
 
   if [[ $prompt =~ [yY](es)* ]]
   then
-    GIT_URL=https://github.com/oktal/pistache.git
+    #GIT_URL=https://github.com/oktal/pistache.git
+    GIT_URL=http://git.opensource5g.org/openxg/pistache.git
     echo "Install Pistache from $GIT_URL"
     pushd $OPENAIRCN_DIR/build/ext
     echo "Downloading Pistache"
@@ -176,7 +179,8 @@ install_nlohmann_from_git() {
 
   if [[ $prompt =~ [yY](es)* ]]
   then
-    GIT_URL=https://github.com/nlohmann/json.git
+    #GIT_URL=https://github.com/nlohmann/json.git
+    GIT_URL=http://git.opensource5g.org/openxg/json.git
     echo "Install Nlohmann Json from $GIT_URL"
     pushd $OPENAIRCN_DIR/build/ext
     echo "Downloading Nlohmann"
@@ -258,7 +262,8 @@ install_nghttp2_from_git() {
     $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
     ret=$?;[[ $ret -ne 0 ]] && return $ret
    
-    GIT_URL=https://github.com/nghttp2/nghttp2.git
+   # GIT_URL=https://github.com/nghttp2/nghttp2.git
+   GIT_URL=http://git.opensource5g.org/openxg/nghttp2.git
     echo "Install nghttp2 from $GIT_URL"
     pushd $OPENAIRCN_DIR/build/ext
     echo "Downloading nghttp2"
@@ -269,7 +274,17 @@ install_nghttp2_from_git() {
 
     git clone $GIT_URL
     cd nghttp2
-    git checkout 43ba3125932c1d56addaeded2b7f62637af255cd
+    #git checkout 43ba3125932c1d56addaeded2b7f62637af255cd
+    git checkout 2befadf337692f721db6f4eba808a3b7434d891b
+    
+    ###不要删除
+    ###切换到43ba3125932c1d56addaeded2b7f62637af255cd
+    ####修改源之后提交的commitid:
+    ####2befadf337692f721db6f4eba808a3b7434d891b
+    ####和最新的master合并之后的commitid:
+    ####da1900fef3480017e1f8f3552fe12cf43ffe94bb
+
+	
     git submodule update --init
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     autoreconf -i
@@ -411,8 +426,8 @@ check_install_smf_deps() {
   ret=$?;[[ $ret -ne 0 ]] && return $ret
 
   # Use fmt lib included in spdlog
-  #install_fmt $1
-  #ret=$?;[[ $ret -ne 0 ]] && return $ret
+  install_fmt $1
+  ret=$?;[[ $ret -ne 0 ]] && return $ret
 
   install_spdlog_from_git $1 $2
   ret=$?;[[ $ret -ne 0 ]] && return $ret

build/scripts/build_smf

@@ -35,7 +35,6 @@ INSTALL_DIR=/usr/local/bin
 THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
 source $THIS_SCRIPT_PATH/build_helper.smf
 
-
 function help()
 {
   echo_error " "

etc/smf.conf

@@ -53,13 +53,13 @@ SMF =
     {
         IPV4_LIST = (
                       {RANGE = "12.1.1.2 - 12.1.1.128";},         # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
-                      {RANGE = "12.1.1.129 - 12.1.1.224";},       # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
+                      {RANGE = "12.1.1.129 - 12.1.1.224";}       # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
                       {RANGE = "10.10.10.2 - 10.10.10.253";}  # STRING, IPv4 RANGE IP_start - IP_end, YOUR NETWORK CONFIG HERE.
 
                     );
         IPV6_LIST = (
                       {PREFIX = "2001:1:2::/64";},                # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
-                      {PREFIX = "3001:1:2::/64";},                # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
+                      {PREFIX = "3001:1:2::/64";}              # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
                       {PREFIX = "4001:1:2::/64";}                 # STRING, IPv6 prefix, YOUR NETWORK CONFIG HERE.
                     );
     };
@@ -121,6 +121,7 @@ SMF =
          { NSSAI_SST = 111; NSSAI_SD = "124", DNN = "oai", DEFAULT_SESSION_TYPE = "IPV4", DEFAULT_SSC_MODE = 1, 
            QOS_PROFILE_5QI = 7, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT", 
            QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "10Mbps", SESSION_AMBR_DL = "11Mbps"}
+       
 	 );                 
     };