paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-04 05:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[IPFilter] Assert if getprotobyname() problem (#977)

Browse Source
This commit is contained in:
Sukchan Lee
2021-05-07 10:47:10 +09:00
parent dc870cc839
commit 182a61dc0b
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ipfw/ipfw2.c
View File

@@ -3269,8 +3269,16 @@ add_proto0(ipfw_insn *cmd, char *av, u_char *protop)
proto = strtol(av, &ep, 10); proto = strtol(av, &ep, 10);
if (*ep != '\0' || proto <= 0) { if (*ep != '\0' || proto <= 0) {
#if 0 /* modified by acetcom */
if ((pe = getprotobyname(av)) == NULL) if ((pe = getprotobyname(av)) == NULL)
return NULL; return NULL;
#else
if ((pe = getprotobyname(av)) == NULL) {
ogs_fatal("getprotobyname('%s') failed", av);
ogs_assert_if_reached();
return NULL;
}
#endif
proto = pe->p_proto; proto = pe->p_proto;
} }

2
lib/ipfw/ipfw2.h
View File

@@ -29,6 +29,8 @@
* XXX The context is not restored after each line. * XXX The context is not restored after each line.
*/ */
#include "ogs-ipfw.h"
struct cmdline_opts { struct cmdline_opts {
/* boolean options: */ /* boolean options: */
int do_value_as_ip; /* show table value as IP */ int do_value_as_ip; /* show table value as IP */

2
lib/ipfw/ogs-ipfw.c
View File

@@ -24,8 +24,6 @@
#endif #endif
#endif #endif
#include "ogs-ipfw.h"
#include "ipfw2.h" #include "ipfw2.h"
#include "objs/include_e/netinet/ip_fw.h" #include "objs/include_e/netinet/ip_fw.h"