projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiler warnings.
[tinc]
/
src
/
subnet_parse.c
diff --git
a/src/subnet_parse.c
b/src/subnet_parse.c
index
5b0b482
..
611d6bd
100644
(file)
--- a/
src/subnet_parse.c
+++ b/
src/subnet_parse.c
@@
-186,6
+186,7
@@
int subnet_compare(const subnet_t *a, const subnet_t *b) {
bool str2net(subnet_t *subnet, const char *subnetstr) {
char str[1024];
strncpy(str, subnetstr, sizeof(str));
bool str2net(subnet_t *subnet, const char *subnetstr) {
char str[1024];
strncpy(str, subnetstr, sizeof(str));
+ str[sizeof str - 1] = 0;
int consumed;
int weight = DEFAULT_WEIGHT;
int consumed;
int weight = DEFAULT_WEIGHT;
@@
-255,7
+256,7
@@
bool str2net(subnet_t *subnet, const char *subnetstr) {
for (int i = 0; i < 4; i++)
if (x[i] > 255)
return false;
for (int i = 0; i < 4; i++)
if (x[i] > 255)
return false;
- s
printf(last_colon, ":%02hx%02hx:%02hx%02h
x", x[0], x[1], x[2], x[3]);
+ s
nprintf(last_colon, sizeof str - (last_colon - str), ":%02x%02x:%02x%02
x", x[0], x[1], x[2], x[3]);
}
char* double_colon = strstr(str, "::");
}
char* double_colon = strstr(str, "::");
@@
-314,7
+315,7
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
int prefixlength = -1;
switch (subnet->type) {
case SUBNET_MAC:
int prefixlength = -1;
switch (subnet->type) {
case SUBNET_MAC:
- result = snprintf(netstr, len, "%02
hx:%02hx:%02hx:%02hx:%02hx:%02h
x",
+ result = snprintf(netstr, len, "%02
x:%02x:%02x:%02x:%02x:%02
x",
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
@@
-326,7
+327,7
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
break;
case SUBNET_IPV4:
break;
case SUBNET_IPV4:
- result = snprintf(netstr, len, "%
hu.%hu.%hu.%h
u",
+ result = snprintf(netstr, len, "%
u.%u.%u.%
u",
subnet->net.ipv4.address.x[0],
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
subnet->net.ipv4.address.x[0],
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
@@
-400,11
+401,8
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
len -= result;
}
len -= result;
}
- if (subnet->weight != DEFAULT_WEIGHT)
{
+ if (subnet->weight != DEFAULT_WEIGHT)
snprintf(netstr, len, "#%d", subnet->weight);
snprintf(netstr, len, "#%d", subnet->weight);
- netstr += result;
- len -= result;
- }
return true;
}
return true;
}