acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fix the bug when only one DNS is configured (#404)

This commit is contained in:
Sukchan Lee 2020-04-10 22:41:48 -04:00
parent 88981a570d
commit 2b69283a81
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pgw/pgw-context.c
View File

@ -672,7 +672,7 @@ int pgw_context_parse_config(void)
}
v = ogs_yaml_iter_value(&dns_iter);
if (v) {
if (v && strlen(v)) {
ogs_ipsubnet_t ipsub;
rv = ogs_ipsubnet(&ipsub, v, NULL);
ogs_assert(rv == OGS_OK);

10
src/pgw/pgw-s5c-build.c
View File

@ -410,12 +410,14 @@ static int16_t pgw_pco_build(uint8_t *pco_buf, ogs_gtp_tlv_pco_t *tlv_pco)
break;
case OGS_PCO_ID_INTERNET_PROTOCOL_CONTROL_PROTOCOL:
if (data[0] == 1) { /* Code : Configuration Request */
uint16_t len = 16;
uint16_t len = 0;
ogs_assert(pgw_self()->dns[0] || pgw_self()->dns[1]);
memset(&pco_ipcp, 0, sizeof(ogs_pco_ipcp_t));
pco_ipcp.code = 2; /* Code : Configuration Ack */
pco_ipcp.len = htons(len);
len = 4;
/* Primary DNS Server IP Address */
if (pgw_self()->dns[0]) {
rv = ogs_ipsubnet(
@ -424,6 +426,7 @@ static int16_t pgw_pco_build(uint8_t *pco_buf, ogs_gtp_tlv_pco_t *tlv_pco)
pco_ipcp.options[0].type = 129;
pco_ipcp.options[0].len = 6;
pco_ipcp.options[0].addr = dns_primary.sub[0];
len += 6;
}
/* Secondary DNS Server IP Address */
@ -434,8 +437,11 @@ static int16_t pgw_pco_build(uint8_t *pco_buf, ogs_gtp_tlv_pco_t *tlv_pco)
pco_ipcp.options[1].type = 131;
pco_ipcp.options[1].len = 6;
pco_ipcp.options[1].addr = dns_secondary.sub[0];
len += 6;
}
pco_ipcp.len = htobe16(len);
pgw.ids[pgw.num_of_id].id = ue.ids[i].id;
pgw.ids[pgw.num_of_id].len = len;
pgw.ids[pgw.num_of_id].data = (uint8_t *)&pco_ipcp;