projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4'
[collectd.git]
/
src
/
netlink.c
diff --git
a/src/netlink.c
b/src/netlink.c
index
f597b01
..
c2e4c9b
100644
(file)
--- a/
src/netlink.c
+++ b/
src/netlink.c
@@
-171,8
+171,8
@@
static void submit_one (const char *dev, const char *type,
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "netlink"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "netlink", sizeof (vl.plugin)
);
sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
sstrncpy (vl.type, type, sizeof (vl.type));
sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
sstrncpy (vl.type, type, sizeof (vl.type));
@@
-195,8
+195,8
@@
static void submit_two (const char *dev, const char *type,
vl.values = values;
vl.values_len = 2;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 2;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "netlink"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "netlink", sizeof (vl.plugin)
);
sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
sstrncpy (vl.type, type, sizeof (vl.type));
sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));
sstrncpy (vl.type, type, sizeof (vl.type));
@@
-207,7
+207,7
@@
static void submit_two (const char *dev, const char *type,
} /* void submit_two */
static int link_filter (const struct sockaddr_nl *sa,
} /* void submit_two */
static int link_filter (const struct sockaddr_nl *sa,
-
const
struct nlmsghdr *nmh, void *args)
+ struct nlmsghdr *nmh, void *args)
{
struct ifinfomsg *msg;
int msg_len;
{
struct ifinfomsg *msg;
int msg_len;
@@
-317,7
+317,7
@@
static int link_filter (const struct sockaddr_nl *sa,
} /* int link_filter */
static int qos_filter (const struct sockaddr_nl *sa,
} /* int link_filter */
static int qos_filter (const struct sockaddr_nl *sa,
-
const
struct nlmsghdr *nmh, void *args)
+ struct nlmsghdr *nmh, void *args)
{
struct tcmsg *msg;
int msg_len;
{
struct tcmsg *msg;
int msg_len;