diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2018-02-23 13:52:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 13:52:42 -0800 |
| commit | f12f08f4c09c13dacbb791c8f0e69b61d365a2b2 (patch) | |
| tree | 245a973d833a31b42cecf81fe3bc87abcbd29cbf | |
| parent | fb444efb6853da1baa0abbfbc4932657518fe6c3 (diff) | |
| parent | 5b02bd3ad01c1bdcf354987133aad75b5cb2f041 (diff) | |
Merge pull request #1796 from donaldsharp/32_silliness
pimd: Fix some compiler issues
| -rw-r--r-- | pimd/mtracebis.c | 2 | ||||
| -rw-r--r-- | pimd/pim_igmp_mtrace.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pimd/mtracebis.c b/pimd/mtracebis.c index 2032cdcfbe..1e7aee858a 100644 --- a/pimd/mtracebis.c +++ b/pimd/mtracebis.c @@ -35,6 +35,8 @@ #include <string.h> #include <time.h> #include <net/if.h> +#include <unistd.h> +#include <getopt.h> #define MTRACEBIS_VERSION "0.1" #define MTRACE_TIMEOUT (5) diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c index 629e10cb0c..feb326c45c 100644 --- a/pimd/pim_igmp_mtrace.c +++ b/pimd/pim_igmp_mtrace.c @@ -492,7 +492,7 @@ int igmp_mtrace_recv_qry_req(struct igmp_sock *igmp, struct ip *ip_hdr, if (PIM_DEBUG_MTRACE) zlog_warn( "Recv mtrace packet from %s on %s: too short," - " len=%d, min=%lu", + " len=%d, min=%zu", from_str, ifp->name, igmp_msg_len, sizeof(struct igmp_mtrace)); return -1; |