diff options
author | Stig Thormodsrud <stig@vyatta.com> | 2008-07-29 09:06:30 -0700 |
---|---|---|
committer | Stig Thormodsrud <stig@vyatta.com> | 2008-07-29 09:06:30 -0700 |
commit | 556eeaec4e31814fd62d2c1394958ab4e7887e79 (patch) | |
tree | c5db46811fdc282771af81a9a86ca149b2bfa2f6 /src/cli_new.c | |
parent | e760483667267fdcbb99628e7626873f618cca4d (diff) | |
download | vyatta-cfg-556eeaec4e31814fd62d2c1394958ab4e7887e79.tar.gz vyatta-cfg-556eeaec4e31814fd62d2c1394958ab4e7887e79.zip |
Fix 3505: cli crashes on ipv6net type.
Diffstat (limited to 'src/cli_new.c')
-rw-r--r-- | src/cli_new.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/cli_new.c b/src/cli_new.c index 0b50ccb..d9e1687 100644 --- a/src/cli_new.c +++ b/src/cli_new.c @@ -35,7 +35,7 @@ /* Global vars: */ vtw_path m_path, t_path; -/* Loval vars: */ +/* Local vars: */ static vtw_node *vtw_free_nodes; /* linked via left */ static char val_name[] = VAL_NAME; static int cond1[TOP_COND] ={5, 0,-1,-1, 0, 1, 0, 0}; @@ -43,23 +43,23 @@ static int cond2[TOP_COND] ={5, 0, 1,-1,-1, 1, 1, 0}; static char const *cond_formats[DOMAIN_TYPE] = { 0, - "%u", /* INT_TYPE */ - "%u.%u.%u.%u", /*IPV4_TYPE*/ - "%u.%u.%u.%u/%u", /*IPV4NET_TYPE*/ - 0, - 0, - "%x:%x:%x:%x:%x:%x" /* MACADDR_TYPE */ + "%u", /* INT_TYPE */ + "%u.%u.%u.%u", /* IPV4_TYPE */ + "%u.%u.%u.%u/%u", /* IPV4NET_TYPE */ + "%x:%x:%x:%x:%x:%x:%x:%x", /* IPV6NET */ + "%x:%x:%x:%x:%x:%x:%x:%x/%u", /* IPV6NET_TYPE */ + "%x:%x:%x:%x:%x:%x" /* MACADDR_TYPE */ }; static int cond_format_lens[DOMAIN_TYPE] = { - 0, - 1, /* INT_TYPE */ - 4, /*IPV4_TYPE*/ - 5, /*IPV4NET_TYPE*/ - 0, - 0, - 6 /* MACADDR_TYPE */ + 0, + 1, /* INT_TYPE */ + 4, /* IPV4_TYPE */ + 5, /* IPV4NET_TYPE */ + 16, /* IPV6_TYPE */ + 17, /* IPV6NET_TYPE */ + 6 /* MACADDR_TYPE */ }; static int cli_val_len; |