Commit f71bc428 authored by chen2022's avatar chen2022

libs更改分组

parent d3635d14
......@@ -94,7 +94,7 @@ install_fb_folly_from_source(){
# 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
git clone http://git.opensource5g.org/libraries/openxg-cnlibs.git
cd /tmp/openxg-cnlibs
tar zxf release-1.8.0.tar.gz && \
......@@ -110,7 +110,7 @@ install_fb_folly_from_source(){
$SUDO rm -rf /tmp/folly
# git clone https://github.com/facebook/folly.git
git clone http://git.opensource5g.org/openxg/folly.git
git clone http://git.opensource5g.org/libraries/folly.git
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
cd folly
if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
......
......@@ -79,7 +79,7 @@ install_libconfig_from_source(){
pushd /tmp
$SUDO rm -rf /tmp/libconfig
#git clone https://github.com/hyperrealm/libconfig.git
git clone http://git.opensource5g.org/openxg/libconfig.git
git clone http://git.opensource5g.org/libraries/libconfig.git
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
cd libconfig
autoreconf -fi
......
......@@ -53,7 +53,7 @@ install_fmt() {
echo "Downloading fmt"
$SUDO rm -rf /tmp/fmt*
#git clone https://github.com/fmtlib/fmt.git
git clone http://git.opensource5g.org/openxg/fmt.git
git clone http://git.opensource5g.org/libraries/fmt.git
ret=$?;[[ $ret -ne 0 ]] && return $ret
cd fmt
# Looks like since Nov 11 commits, we cannot build
......@@ -90,7 +90,7 @@ install_spdlog_from_git() {
if [[ $prompt =~ [yY](es)* ]]
then
#GIT_URL=https://github.com/gabime/spdlog.git
GIT_URL=http://git.opensource5g.org/openxg/spdlog.git
GIT_URL=http://git.opensource5g.org/libraries/spdlog.git
echo "Install spdlog from $GIT_URL"
pushd $OPENAIRCN_DIR/build/ext
echo "Downloading spdlog"
......@@ -130,7 +130,7 @@ install_pistache_from_git() {
if [[ $prompt =~ [yY](es)* ]]
then
#GIT_URL=https://github.com/oktal/pistache.git
GIT_URL=http://git.opensource5g.org/openxg/pistache.git
GIT_URL=http://git.opensource5g.org/libraries/pistache.git
echo "Install Pistache from $GIT_URL"
pushd $OPENAIRCN_DIR/build/ext
echo "Downloading Pistache"
......@@ -180,7 +180,7 @@ install_nlohmann_from_git() {
if [[ $prompt =~ [yY](es)* ]]
then
#GIT_URL=https://github.com/nlohmann/json.git
GIT_URL=http://git.opensource5g.org/openxg/json.git
GIT_URL=http://git.opensource5g.org/libraries/json.git
echo "Install Nlohmann Json from $GIT_URL"
pushd $OPENAIRCN_DIR/build/ext
echo "Downloading Nlohmann"
......@@ -263,7 +263,7 @@ install_nghttp2_from_git() {
ret=$?;[[ $ret -ne 0 ]] && return $ret
# GIT_URL=https://github.com/nghttp2/nghttp2.git
GIT_URL=http://git.opensource5g.org/openxg/nghttp2.git
GIT_URL=http://git.opensource5g.org/libraries/nghttp2.git
echo "Install nghttp2 from $GIT_URL"
pushd $OPENAIRCN_DIR/build/ext
echo "Downloading nghttp2"
......@@ -275,9 +275,13 @@ install_nghttp2_from_git() {
git clone $GIT_URL
cd nghttp2
#git checkout 43ba3125932c1d56addaeded2b7f62637af255cd
git checkout 2befadf337692f721db6f4eba808a3b7434d891b
#git checkout 2befadf337692f721db6f4eba808a3b7434d891b
###不要删除
##第二次修改:分组的修改:
git checkout 76f6a58980d026e97d4d96ae1e7b76d2903ac71e
##第一次修改:转移从github仓库的修改
###切换到43ba3125932c1d56addaeded2b7f62637af255cd
####修改源之后提交的commitid:
####2befadf337692f721db6f4eba808a3b7434d891b
......
......@@ -21,7 +21,7 @@
SMF =
{
INSTANCE = 10; # 0 is the default
INSTANCE = 12; # 0 is the default
PID_DIRECTORY = "/var/run"; # /var/run is the default
INTERFACES :
......@@ -31,13 +31,13 @@ SMF =
# SMF binded interface for N4 communication (UPF)
INTERFACE_NAME = "lo"; # YOUR NETWORK CONFIG HERE
IPV4_ADDRESS = "127.0.0.2/24";
PORT =8805;
PORT =8805;
};
SBI :
{
# SMF binded interface for SBI interface (e.g., communication with AMF, UDM)
INTERFACE_NAME = "ens32"; # YOUR NETWORK CONFIG HERE
INTERFACE_NAME = "ens33"; # YOUR NETWORK CONFIG HERE
IPV4_ADDRESS = "read";
PORT = 8889; # YOUR NETWORK CONFIG HERE (default: 80)
HTTP2_PORT = 8890; # YOUR NETWORK CONFIG HERE
......@@ -90,7 +90,7 @@ SMF =
AMF :
{
IPV4_ADDRESS = "192.168.199.186"; # YOUR AMF CONFIG HERE
IPV4_ADDRESS = "192.168.199.17"; # YOUR AMF CONFIG HERE
PORT = 8282; # YOUR AMF CONFIG HERE (default: 80)
API_VERSION = "v2"; # YOUR AMF API VERSION FOR SBI CONFIG HERE
};
......@@ -123,12 +123,11 @@ SMF =
# 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"}
USE_LOCAL_CONFIGURATION = "yes";
USE_LOCAL_CONFIGURATION = "yes";
SESSION_MANAGEMENT_SUBSCRIPTION_LIST = (
{ NSSAI_SST = 1, NSSAI_SD = "0", DNN = "IMS", DEFAULT_SESSION_TYPE = "IPV4V6", DEFAULT_SSC_MODE = 1,QOS_PROFILE_5QI = 5, 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 = "20Mbps", SESSION_AMBR_DL = "22Mbps"},
{ NSSAI_SST = 1, NSSAI_SD = "0", DNN = "IMS", DEFAULT_SESSION_TYPE = "IPV4V6", DEFAULT_SSC_MODE = 1,QOS_PROFILE_5QI = 5, 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 = "20Mbps", SESSION_AMBR_DL = "22Mbps"},
{ NSSAI_SST = 1, NSSAI_SD = "0", DNN = "ctnet", DEFAULT_SESSION_TYPE = "IPV4V6", DEFAULT_SSC_MODE = 1,QOS_PROFILE_5QI = 9, 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 = "100Mbps", SESSION_AMBR_DL = "110Mbps"},
{ NSSAI_SST = 1, NSSAI_SD = "0", DNN = "internet", DEFAULT_SESSION_TYPE = "IPV4", DEFAULT_SSC_MODE = 1,QOS_PROFILE_5QI = 9, 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 = "100Mbps", SESSION_AMBR_DL = "110Mbps"}
);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment