matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iproute2: utils: change hexstring_n2a and hexstring_a2n to do not work with ":" 

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
This commit is contained in:
Jiri Pirko 2014-05-15 15:10:21 +02:00 committed by Stephen Hemminger
parent dd50247dba
commit 316c2346f7
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/utils.c
View File

@ -743,10 +743,6 @@ char *hexstring_n2a(const __u8 *str, int len, char *buf, int blen)
sprintf(ptr, "%02x", str[i]); sprintf(ptr, "%02x", str[i]);
ptr += 2; ptr += 2;
blen -= 2; blen -= 2;
if (i != len-1 && blen > 1) {
*ptr++ = ':';
blen--;
}
} }
return buf; return buf;
} }
@ -754,38 +750,22 @@ char *hexstring_n2a(const __u8 *str, int len, char *buf, int blen)
__u8* hexstring_a2n(const char *str, __u8 *buf, int blen) __u8* hexstring_a2n(const char *str, __u8 *buf, int blen)
{ {
int cnt = 0; int cnt = 0;
char *endptr;
for (;;) { if (strlen(str) % 2)
unsigned acc; return NULL;
char ch; while (cnt < blen && strlen(str) > 1) {
unsigned int tmp;
char tmpstr[3];
acc = 0; strncpy(tmpstr, str, 2);
tmpstr[2] = '\0';
while ((ch = *str) != ':' && ch != 0) { tmp = strtoul(tmpstr, &endptr, 16);
if (ch >= '0' && ch <= '9') if (errno != 0 || tmp > 0xFF || *endptr != '\0')
ch -= '0';
else if (ch >= 'a' && ch <= 'f')
ch -= 'a'-10;
else if (ch >= 'A' && ch <= 'F')
ch -= 'A'-10;
else
return NULL;
acc = (acc<<4) + ch;
str++;
}
if (acc > 255)
return NULL; return NULL;
if (cnt < blen) { buf[cnt++] = tmp;
buf[cnt] = acc; str += 2;
cnt++;
}
if (ch == 0)
break;
++str;
} }
if (cnt < blen)
memset(buf+cnt, 0, blen-cnt);
return buf; return buf;
} }