diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-11-18 10:32:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@2a01:4f8:191:444b:0:0:2:12> | 2017-11-18 10:32:37 +0000 |
| commit | bebd75c2d1142ede132a39180776e6fb86a86be8 (patch) | |
| tree | fcb2d79407cb1f007ca2f6445780ef7474ec0d3c | |
| parent | 878ece768b940ad5e34c4837a2d43c3c91893939 (diff) | |
| parent | a00e79242b035c050767c67b32281ae2cd7a45f7 (diff) | |
Merge changes Id4724fe0,I5c619712
* changes:
contrib/jenkins.sh: Enable Werror in C(PP)FLAGS
ggsn_vty: Stop using deprecated API vty_install_default
| -rwxr-xr-x | contrib/jenkins.sh | 2 | ||||
| -rw-r--r-- | ggsn/ggsn_vty.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 6a718a8..4437541 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -35,7 +35,7 @@ set -x cd "$base" autoreconf --install --force -./configure $GTP +./configure CFLAGS="-Werror" CPPFLAGS="-Werror" $GTP $MAKE $PARALLEL_MAKE $MAKE distcheck diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 9f343ec..6e15ae4 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -856,8 +856,8 @@ int ggsn_vty_init(void) install_element(CONFIG_NODE, &cfg_ggsn_cmd); install_element(CONFIG_NODE, &cfg_no_ggsn_cmd); + install_node(&ggsn_node, config_write_ggsn); - vty_install_default(GGSN_NODE); install_element(GGSN_NODE, &cfg_description_cmd); install_element(GGSN_NODE, &cfg_no_description_cmd); install_element(GGSN_NODE, &cfg_ggsn_shutdown_cmd); @@ -872,7 +872,6 @@ int ggsn_vty_init(void) install_element(GGSN_NODE, &cfg_ggsn_no_default_apn_cmd); install_node(&apn_node, NULL); - vty_install_default(APN_NODE); install_element(APN_NODE, &cfg_description_cmd); install_element(APN_NODE, &cfg_no_description_cmd); install_element(APN_NODE, &cfg_apn_shutdown_cmd); |