diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2019-02-11 23:29:53 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2019-02-11 23:29:53 +0100 |
| commit | 7c3db1d6203a1a63c663373917e80db42b44120b (patch) | |
| tree | 205e5f1c223f24ea0a28d77a83ff36d88f3cb7c7 /sys | |
| parent | a7c01127f9749fe471367c6461cde357403cc3b3 (diff) | |
ip/ipconfig: use new parseipandmask() function
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/src/cmd/ip/ipconfig/main.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sys/src/cmd/ip/ipconfig/main.c b/sys/src/cmd/ip/ipconfig/main.c index 5a85fddc5..3a8889d79 100644 --- a/sys/src/cmd/ip/ipconfig/main.c +++ b/sys/src/cmd/ip/ipconfig/main.c @@ -118,12 +118,11 @@ parsenorm(int argc, char **argv) usage(); /* fall through */ case 2: - /* - * can't test for parseipmask()==-1 cuz 255.255.255.255 - * looks like that. - */ - if (strcmp(argv[1], "0") != 0) - parseipmask(conf.mask, argv[1]); + if (strcmp(argv[1], "0") != 0){ + if (parseipandmask(conf.laddr, conf.mask, argv[0], argv[1]) == -1) + usage(); + break; + } /* fall through */ case 1: if (parseip(conf.laddr, argv[0]) == -1) @@ -742,15 +741,13 @@ defroutectl(char *cmd, uchar *gaddr, uchar *ia, uchar *src, uchar *smask) uchar dst[IPaddrlen], mask[IPaddrlen]; if(isv4(gaddr)){ - parseip(dst, "0.0.0.0"); - parseipmask(mask, "0.0.0.0"); + parseipandmask(dst, mask, "0.0.0.0", "0.0.0.0"); if(src == nil) src = dst; if(smask == nil) smask = mask; } else { - parseip(dst, "2000::"); - parseipmask(mask, "/3"); + parseipandmask(dst, mask, "2000::", "/3"); if(src == nil) src = IPnoaddr; if(smask == nil) @@ -1022,7 +1019,7 @@ ndb2conf(Ndb *db, uchar *myip) } if(strcmp(nt->attr, "ipmask") == 0) { nt = uniquent(nt); - parseipmask(conf.mask, nt->val); /* could be -1 */ + parseipmask(conf.mask, nt->val, isv4(myip)); continue; } if(parseip(ip, nt->val) == -1) { |