Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-AMF
Commits
beb25ce6
Commit
beb25ce6
authored
May 31, 2021
by
liuyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete a word
parent
bbbd0ab4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
27 deletions
+27
-27
etc/amf_docker.conf
etc/amf_docker.conf
+3
-3
etc/etc_amf_openxg.conf
etc/etc_amf_openxg.conf
+1
-1
etc/ly.conf
etc/ly.conf
+1
-1
src/amf-app/amf_n2.cpp
src/amf-app/amf_n2.cpp
+1
-1
src/ngap/libngap/NativeEnumerated.c
src/ngap/libngap/NativeEnumerated.c
+1
-1
src/ngap/libngap/NativeInteger.c
src/ngap/libngap/NativeInteger.c
+1
-1
src/ngap/libngap/constr_CHOICE.c
src/ngap/libngap/constr_CHOICE.c
+9
-9
src/ngap/libngap/constr_SEQUENCE.c
src/ngap/libngap/constr_SEQUENCE.c
+6
-6
src/ngap/libngap/per_opentype.c
src/ngap/libngap/per_opentype.c
+4
-4
No files found.
etc/amf_docker.conf
View file @
beb25ce6
...
@@ -60,7 +60,7 @@ AMF =
...
@@ -60,7 +60,7 @@ AMF =
# AMF binded interface for N1/N2 interface (NGAP)
# AMF binded interface for N1/N2 interface (NGAP)
NGAP_AMF
:
NGAP_AMF
:
{
{
INTERFACE_NAME
=
"
eth
0"
;
# YOUR NETWORK CONFIG HERE
INTERFACE_NAME
=
"
wlp58s
0"
;
# YOUR NETWORK CONFIG HERE
IPV4_ADDRESS
=
"read"
;
IPV4_ADDRESS
=
"read"
;
PORT
=
38412
;
# YOUR NETWORK CONFIG HERE
PORT
=
38412
;
# YOUR NETWORK CONFIG HERE
PPID
=
60
;
# YOUR NETWORK CONFIG HERE
PPID
=
60
;
# YOUR NETWORK CONFIG HERE
...
@@ -76,7 +76,7 @@ AMF =
...
@@ -76,7 +76,7 @@ AMF =
# AMF binded interface for N11
# AMF binded interface for N11
N11
:
N11
:
{
{
INTERFACE_NAME
=
"
eth
0"
;
# YOUR NETWORK CONFIG HERE
INTERFACE_NAME
=
"
wlp58s
0"
;
# YOUR NETWORK CONFIG HERE
IPV4_ADDRESS
=
"read"
;
IPV4_ADDRESS
=
"read"
;
PORT
=
8282
;
# YOUR NETWORK CONFIG HERE
PORT
=
8282
;
# YOUR NETWORK CONFIG HERE
...
@@ -91,7 +91,7 @@ AMF =
...
@@ -91,7 +91,7 @@ AMF =
AUTHENTICATION
:
AUTHENTICATION
:
{
{
## MySQL mandatory options
## MySQL mandatory options
MYSQL_server
=
"1
72.16.200.10
"
;
# MySQL Server address
MYSQL_server
=
"1
27.0.0.1
"
;
# MySQL Server address
MYSQL_user
=
"yunshou"
;
# Database server login
MYSQL_user
=
"yunshou"
;
# Database server login
MYSQL_pass
=
"123456"
;
# Database server password
MYSQL_pass
=
"123456"
;
# Database server password
MYSQL_db
=
"OAI_DB"
;
# Your database name
MYSQL_db
=
"OAI_DB"
;
# Your database name
...
...
etc/etc_amf_openxg.conf
View file @
beb25ce6
...
@@ -65,7 +65,7 @@ AMF =
...
@@ -65,7 +65,7 @@ AMF =
PORT
=
38412
;
# YOUR NETWORK CONFIG HERE
PORT
=
38412
;
# YOUR NETWORK CONFIG HERE
PPID
=
60
;
# YOUR NETWORK CONFIG HERE
PPID
=
60
;
# YOUR NETWORK CONFIG HERE
};
};
# AMF binded interface for N11
# AMF binded interface for N11
N11
:
N11
:
{
{
...
...
etc/ly.conf
View file @
beb25ce6
...
@@ -26,7 +26,7 @@ AMF =
...
@@ -26,7 +26,7 @@ AMF =
AMF_NAME
=
"OAI-AMF"
;
AMF_NAME
=
"OAI-AMF"
;
RELATIVE_CAPACITY
=
5
0
;
RELATIVE_CAPACITY
=
3
0
;
# Display statistics about whole system (in seconds)
# Display statistics about whole system (in seconds)
STATISTICS_TIMER_INTERVAL
=
20
;
# YOUR CONFIG HERE
STATISTICS_TIMER_INTERVAL
=
20
;
# YOUR CONFIG HERE
...
...
src/amf-app/amf_n2.cpp
View file @
beb25ce6
...
@@ -421,7 +421,7 @@ void amf_n2::handle_itti_message(itti_ng_setup_request &itti_msg) {
...
@@ -421,7 +421,7 @@ void amf_n2::handle_itti_message(itti_ng_setup_request &itti_msg) {
// gc1->gnb_context_from_json(udsf_response);
// gc1->gnb_context_from_json(udsf_response);
// gc2 = std::shared_ptr<gnb_context>(gc1);
// gc2 = std::shared_ptr<gnb_context>(gc1);
// printf("gnbname-%s\n",gc2.get()->gnb_name.c_str());
// printf("globalgnbid-%d\n",gc2.get()->globalRanNodeId);
// printf("globalgnbid-%d\n",gc2.get()->globalRanNodeId);
// printf("next stream-%d\n",gc2.get()->next_sctp_stream);
// printf("next stream-%d\n",gc2.get()->next_sctp_stream);
return
;
return
;
...
...
src/ngap/libngap/NativeEnumerated.c
View file @
beb25ce6
...
@@ -243,7 +243,7 @@ asn_dec_rval_t NativeEnumerated_decode_aper(
...
@@ -243,7 +243,7 @@ asn_dec_rval_t NativeEnumerated_decode_aper(
}
}
ASN_DEBUG
(
"Decoding %s as NativeEnumerated"
,
td
->
name
);
ASN_DEBUG
(
"Decoding %s as NativeEnumerated"
,
td
->
name
);
printf
(
"test0515 Decoding %s as NativeEnumerated
\n
"
,
td
->
name
);
//
printf("test0515 Decoding %s as NativeEnumerated\n", td->name);
if
(
ct
->
flags
&
APC_EXTENSIBLE
)
{
if
(
ct
->
flags
&
APC_EXTENSIBLE
)
{
int
inext
=
per_get_few_bits
(
pd
,
1
);
int
inext
=
per_get_few_bits
(
pd
,
1
);
...
...
src/ngap/libngap/NativeInteger.c
View file @
beb25ce6
...
@@ -321,7 +321,7 @@ asn_dec_rval_t NativeInteger_decode_aper(
...
@@ -321,7 +321,7 @@ asn_dec_rval_t NativeInteger_decode_aper(
(
void
)
opt_codec_ctx
;
(
void
)
opt_codec_ctx
;
ASN_DEBUG
(
"Decoding NativeInteger %s (APER)"
,
td
->
name
);
ASN_DEBUG
(
"Decoding NativeInteger %s (APER)"
,
td
->
name
);
printf
(
"test0515 Decoding NativeInteger %s (APER)
\n
"
,
td
->
name
);
//
printf("test0515 Decoding NativeInteger %s (APER)\n", td->name);
if
(
!
native
)
{
if
(
!
native
)
{
native
=
(
long
*
)
(
*
sptr
=
CALLOC
(
1
,
sizeof
(
*
native
)));
native
=
(
long
*
)
(
*
sptr
=
CALLOC
(
1
,
sizeof
(
*
native
)));
...
...
src/ngap/libngap/constr_CHOICE.c
View file @
beb25ce6
...
@@ -1033,9 +1033,9 @@ asn_dec_rval_t CHOICE_decode_aper(
...
@@ -1033,9 +1033,9 @@ asn_dec_rval_t CHOICE_decode_aper(
if
(
value
<
0
)
ASN__DECODE_STARVED
;
if
(
value
<
0
)
ASN__DECODE_STARVED
;
ASN_DEBUG
(
ASN_DEBUG
(
"CHOICE %s got index %d in range %d"
,
td
->
name
,
value
,
ct
->
range_bits
);
"CHOICE %s got index %d in range %d"
,
td
->
name
,
value
,
ct
->
range_bits
);
printf
(
//
printf(
"test0515 CHOICE %s got index %d in range %d
\n
"
,
td
->
name
,
value
,
//
"test0515 CHOICE %s got index %d in range %d\n", td->name, value,
ct
->
range_bits
);
//
ct->range_bits);
if
(
value
>
ct
->
upper_bound
)
ASN__DECODE_FAILED
;
if
(
value
>
ct
->
upper_bound
)
ASN__DECODE_FAILED
;
}
else
{
}
else
{
if
(
specs
->
ext_start
==
-
1
)
ASN__DECODE_FAILED
;
if
(
specs
->
ext_start
==
-
1
)
ASN__DECODE_FAILED
;
...
@@ -1060,9 +1060,9 @@ asn_dec_rval_t CHOICE_decode_aper(
...
@@ -1060,9 +1060,9 @@ asn_dec_rval_t CHOICE_decode_aper(
memb_ptr2
=
&
memb_ptr
;
memb_ptr2
=
&
memb_ptr
;
}
}
ASN_DEBUG
(
"Discovered CHOICE %s encodes %s"
,
td
->
name
,
elm
->
name
);
ASN_DEBUG
(
"Discovered CHOICE %s encodes %s"
,
td
->
name
,
elm
->
name
);
printf
(
//
printf(
"test1130 decoding element(%s) in td->name(%s), pointer(%p)
\n
"
,
elm
->
name
,
//
"test1130 decoding element(%s) in td->name(%s), pointer(%p)\n", elm->name,
td
->
name
,
memb_ptr2
);
//
td->name, memb_ptr2);
if
(
ct
&&
ct
->
range_bits
>=
0
)
{
if
(
ct
&&
ct
->
range_bits
>=
0
)
{
rv
=
elm
->
type
->
op
->
aper_decoder
(
rv
=
elm
->
type
->
op
->
aper_decoder
(
...
@@ -1077,9 +1077,9 @@ asn_dec_rval_t CHOICE_decode_aper(
...
@@ -1077,9 +1077,9 @@ asn_dec_rval_t CHOICE_decode_aper(
if
(
rv
.
code
!=
RC_OK
)
{
if
(
rv
.
code
!=
RC_OK
)
{
ASN_DEBUG
(
ASN_DEBUG
(
"Failed to decode %s in %s (CHOICE) %d"
,
elm
->
name
,
td
->
name
,
rv
.
code
);
"Failed to decode %s in %s (CHOICE) %d"
,
elm
->
name
,
td
->
name
,
rv
.
code
);
printf
(
//
printf(
"test0515 Failed to decode %s in %s (CHOICE) %d
\n
"
,
elm
->
name
,
td
->
name
,
//
"test0515 Failed to decode %s in %s (CHOICE) %d\n", elm->name, td->name,
rv
.
code
);
//
rv.code);
}
}
return
rv
;
return
rv
;
}
}
...
...
src/ngap/libngap/constr_SEQUENCE.c
View file @
beb25ce6
...
@@ -945,7 +945,7 @@ int SEQUENCE_print(
...
@@ -945,7 +945,7 @@ int SEQUENCE_print(
for
(
edx
=
0
;
edx
<
td
->
elements_count
;
edx
++
)
{
for
(
edx
=
0
;
edx
<
td
->
elements_count
;
edx
++
)
{
asn_TYPE_member_t
*
elm
=
&
td
->
elements
[
edx
];
asn_TYPE_member_t
*
elm
=
&
td
->
elements
[
edx
];
printf
(
"element name: %s
\n
"
,
elm
->
name
);
//
printf("element name: %s\n", elm->name);
const
void
*
memb_ptr
;
const
void
*
memb_ptr
;
if
(
elm
->
flags
&
ATF_POINTER
)
{
if
(
elm
->
flags
&
ATF_POINTER
)
{
...
@@ -1498,7 +1498,7 @@ asn_dec_rval_t SEQUENCE_decode_aper(
...
@@ -1498,7 +1498,7 @@ asn_dec_rval_t SEQUENCE_decode_aper(
}
}
ASN_DEBUG
(
"Decoding %s as SEQUENCE (APER)"
,
td
->
name
);
ASN_DEBUG
(
"Decoding %s as SEQUENCE (APER)"
,
td
->
name
);
printf
(
"test0515 Decoding %s as SEQUENCE (APER)
\n
"
,
td
->
name
);
//
printf("test0515 Decoding %s as SEQUENCE (APER)\n", td->name);
/* Handle extensions */
/* Handle extensions */
if
(
specs
->
first_extension
<
0
)
{
if
(
specs
->
first_extension
<
0
)
{
...
@@ -1572,9 +1572,9 @@ asn_dec_rval_t SEQUENCE_decode_aper(
...
@@ -1572,9 +1572,9 @@ asn_dec_rval_t SEQUENCE_decode_aper(
ASN_DEBUG
(
ASN_DEBUG
(
"Member %s->%s is optional, p=%d (%d->%d)"
,
td
->
name
,
elm
->
name
,
"Member %s->%s is optional, p=%d (%d->%d)"
,
td
->
name
,
elm
->
name
,
present
,
(
int
)
opmd
.
nboff
,
(
int
)
opmd
.
nbits
);
present
,
(
int
)
opmd
.
nboff
,
(
int
)
opmd
.
nbits
);
printf
(
//
printf(
"test0515 Member %s->%s is optional, p=%d (%d->%d)
\n
"
,
td
->
name
,
//
"test0515 Member %s->%s is optional, p=%d (%d->%d)\n", td->name,
elm
->
name
,
present
,
(
int
)
opmd
.
nboff
,
(
int
)
opmd
.
nbits
);
//
elm->name, present, (int) opmd.nboff, (int) opmd.nbits);
if
(
present
==
0
)
{
if
(
present
==
0
)
{
/* This element is not present */
/* This element is not present */
if
(
elm
->
default_value_set
)
{
if
(
elm
->
default_value_set
)
{
...
@@ -1593,7 +1593,7 @@ asn_dec_rval_t SEQUENCE_decode_aper(
...
@@ -1593,7 +1593,7 @@ asn_dec_rval_t SEQUENCE_decode_aper(
/* Fetch the member from the stream */
/* Fetch the member from the stream */
ASN_DEBUG
(
"Decoding member
\"
%s
\"
in %s"
,
elm
->
name
,
td
->
name
);
ASN_DEBUG
(
"Decoding member
\"
%s
\"
in %s"
,
elm
->
name
,
td
->
name
);
printf
(
"test0515 Decoding member
\"
%s
\"
in %s
\n
"
,
elm
->
name
,
td
->
name
);
//
printf("test0515 Decoding member \"%s\" in %s\n", elm->name, td->name);
if
(
elm
->
flags
&
ATF_OPEN_TYPE
)
{
if
(
elm
->
flags
&
ATF_OPEN_TYPE
)
{
rv
=
OPEN_TYPE_aper_get
(
opt_codec_ctx
,
td
,
st
,
elm
,
pd
);
rv
=
OPEN_TYPE_aper_get
(
opt_codec_ctx
,
td
,
st
,
elm
,
pd
);
...
...
src/ngap/libngap/per_opentype.c
View file @
beb25ce6
...
@@ -407,7 +407,7 @@ static asn_dec_rval_t aper_open_type_get_simple(
...
@@ -407,7 +407,7 @@ static asn_dec_rval_t aper_open_type_get_simple(
ASN__STACK_OVERFLOW_CHECK
(
ctx
);
ASN__STACK_OVERFLOW_CHECK
(
ctx
);
ASN_DEBUG
(
"Getting open type %s..."
,
td
->
name
);
ASN_DEBUG
(
"Getting open type %s..."
,
td
->
name
);
printf
(
"test0515 Getting open type %s...
\n
"
,
td
->
name
);
//
printf("test0515 Getting open type %s...\n", td->name);
do
{
do
{
//printf("test1130 while repeat1(%d)\n", repeat);
//printf("test1130 while repeat1(%d)\n", repeat);
...
@@ -436,9 +436,9 @@ static asn_dec_rval_t aper_open_type_get_simple(
...
@@ -436,9 +436,9 @@ static asn_dec_rval_t aper_open_type_get_simple(
// ASN_DEBUG("Getting open type %s encoded in %ld bytes", td->name,
// ASN_DEBUG("Getting open type %s encoded in %ld bytes", td->name,
// (long)bufLen);
// (long)bufLen);
printf
(
//
printf(
"test1130 Getting open type %s encoded in %ld bytes
\n
"
,
td
->
name
,
//
"test1130 Getting open type %s encoded in %ld bytes\n", td->name,
(
long
)
bufLen
);
//
(long) bufLen);
memset
(
&
spd
,
0
,
sizeof
(
spd
));
memset
(
&
spd
,
0
,
sizeof
(
spd
));
spd
.
buffer
=
buf
;
spd
.
buffer
=
buf
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment