From a7c01127f9749fe471367c6461cde357403cc3b3 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 11 Feb 2019 23:28:43 +0100 Subject: libndb: provide parseipmask() v4 argument in subnet(), use snprint() instead of sprint() --- sys/src/libndb/ndbipinfo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/src/libndb/ndbipinfo.c b/sys/src/libndb/ndbipinfo.c index bf0f8dd76..e2bb8ca6f 100644 --- a/sys/src/libndb/ndbipinfo.c +++ b/sys/src/libndb/ndbipinfo.c @@ -120,20 +120,20 @@ static Ndbtuple* subnet(Ndb *db, uchar *net, Ndbtuple *f, int prefix) { Ndbs s; - Ndbtuple *t, *nt, *xt; - char netstr[128]; + char netstr[64]; uchar mask[IPaddrlen]; + Ndbtuple *t, *nt, *xt; int masklen; t = nil; - sprint(netstr, "%I", net); + snprint(netstr, sizeof(netstr), "%I", net); nt = ndbsearch(db, &s, "ip", netstr); while(nt != nil){ xt = ndbfindattr(nt, nt, "ipnet"); - if(xt){ + if(xt != nil){ xt = ndbfindattr(nt, nt, "ipmask"); - if(xt) - parseipmask(mask, xt->val); + if(xt != nil) + parseipmask(mask, xt->val, isv4(net)); else ipmove(mask, defmask(net)); masklen = prefixlen(mask); -- cgit v1.2.3