summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-06-11 13:38:59 -0400
committerThomas Markwalder <tmark@isc.org>2019-06-12 09:57:33 -0400
commite119ecf6b782253bfc3528e4779481661e2b9bb8 (patch)
treed4e0780ed8cce4b496514c788628a23e344beaef /includes
parent753d458b1f257cc2107454db158e14e92fcecb11 (diff)
downloadisc-dhcp-e119ecf6b782253bfc3528e4779481661e2b9bb8.tar.gz
[#15,!10] Addressed review comments
common/discover.c discover_interfaces() - replaced strncpy with memcpy common/parse.c parse_warn() - added final message buffer rather than reuse mbuf, pass size into do_percentm call includes/dhcpd.h struct interface_info - restored size of name includes/omapip/omapip_p.* do_percentm() - added output buffer size parameter omapip/errwarn.c pass size of output buffer into calls to do_percentm
Diffstat (limited to 'includes')
-rw-r--r--includes/dhcpd.h3
-rw-r--r--includes/omapip/omapip_p.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 0ce3d00c..d4c81fc1 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -1392,7 +1392,8 @@ struct interface_info {
interface (if any). */
unsigned remote_id_len; /* Length of Remote ID. */
- char name [IFNAMSIZ+1]; /* Its name... */
+ char name [IFNAMSIZ]; /* Its name... */
+
int index; /* Its if_nametoindex(). */
int rfdesc; /* Its read file descriptor. */
int wfdesc; /* Its write file descriptor, if
diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h
index 7fe1eba5..c92f9420 100644
--- a/includes/omapip/omapip_p.h
+++ b/includes/omapip/omapip_p.h
@@ -288,7 +288,8 @@ int log_info (const char *, ...)
__attribute__((__format__(__printf__,1,2)));
int log_debug (const char *, ...)
__attribute__((__format__(__printf__,1,2)));
-void do_percentm (char *obuf, const char *ibuf);
+
+void do_percentm (char *obuf, size_t obufsize, const char *ibuf);
isc_result_t uerr2isc (int);
isc_result_t ns_rcode_to_isc (int);