diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-29 15:53:49 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-29 15:53:49 -0700 |
| commit | 51dabae40799358785a147b3447b7075e7fae22b (patch) | |
| tree | f0eb1f6b3c224edfb794443f9b9ba19d650157c4 /src | |
| parent | 5cfca8801a52bf8e9421417f82a4cee6cfe8653e (diff) | |
| parent | e1cc907f3e29bfedf123c28da24d45f187198ece (diff) | |
| download | vyatta-cfg-51dabae40799358785a147b3447b7075e7fae22b.tar.gz vyatta-cfg-51dabae40799358785a147b3447b7075e7fae22b.zip | |
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg into islavista
Diffstat (limited to 'src')
| -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; |