diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-03-03 08:55:26 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-04-21 10:17:57 +0200 |
| commit | 21401f3215be26dcb0f787105f5907745498e966 (patch) | |
| tree | c99c59e06f3fddad44cbd977f8fadad2dc9e76a7 /isisd | |
| parent | b7d5021bfa161f797cbfb1e92bf5b94327fb1b71 (diff) | |
| download | quagga-21401f3215be26dcb0f787105f5907745498e966.tar.bz2 quagga-21401f3215be26dcb0f787105f5907745498e966.tar.xz | |
*: fix signedness mix-ups
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_bpf.c | 7 | ||||
| -rw-r--r-- | isisd/isis_lsp.c | 2 | ||||
| -rw-r--r-- | isisd/isis_pdu.c | 8 | ||||
| -rw-r--r-- | isisd/isis_pfpacket.c | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c index 4d5b1651..f6176ef7 100644 --- a/isisd/isis_bpf.c +++ b/isisd/isis_bpf.c @@ -301,13 +301,14 @@ int isis_send_pdu_bcast (struct isis_circuit *circuit, int level) { struct ether_header *eth; - int written, buflen; + ssize_t written; + size_t buflen; buflen = stream_get_endp (circuit->snd_stream) + LLC_LEN + ETHER_HDR_LEN; if (buflen > sizeof (sock_buff)) { - zlog_warn ("isis_send_pdu_bcast: sock_buff size %lu is less than " - "output pdu size %d on circuit %s", + zlog_warn ("isis_send_pdu_bcast: sock_buff size %zu is less than " + "output pdu size %zu on circuit %s", sizeof (sock_buff), buflen, circuit->interface->name); return ISIS_WARNING; } diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index f2a7923d..83dc604c 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -379,7 +379,7 @@ lsp_auth_update (struct isis_lsp *lsp) /* Compute autentication value */ hmac_md5 (STREAM_DATA (lsp->pdu), stream_get_endp(lsp->pdu), (unsigned char *) &passwd->passwd, passwd->len, - (caddr_t) &hmac_md5_hash); + (unsigned char *) &hmac_md5_hash); /* Copy the hash into the stream */ memcpy (STREAM_DATA (lsp->pdu) + lsp->auth_tlv_offset + 3, hmac_md5_hash, ISIS_AUTH_MD5_SIZE); diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 166dd7c0..557dc010 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -204,7 +204,7 @@ authentication_check (struct isis_passwd *remote, struct isis_passwd *local, /* Compute the digest */ hmac_md5 (STREAM_DATA (stream), stream_get_endp (stream), (unsigned char *) &(local->passwd), local->len, - (caddr_t) &digest); + (unsigned char *) &digest); /* Copy back the authentication value after the check */ memcpy (STREAM_DATA (stream) + auth_tlv_offset + 3, remote->passwd, ISIS_AUTH_MD5_SIZE); @@ -2469,7 +2469,7 @@ send_hello (struct isis_circuit *circuit, int level) hmac_md5 (STREAM_DATA (circuit->snd_stream), stream_get_endp (circuit->snd_stream), (unsigned char *) &circuit->passwd.passwd, circuit->passwd.len, - (caddr_t) &hmac_md5_hash); + (unsigned char *) &hmac_md5_hash); /* Copy the hash into the stream */ memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3, hmac_md5_hash, ISIS_AUTH_MD5_SIZE); @@ -2656,7 +2656,7 @@ build_csnp (int level, u_char * start, u_char * stop, struct list *lsps, hmac_md5 (STREAM_DATA (circuit->snd_stream), stream_get_endp(circuit->snd_stream), (unsigned char *) &passwd->passwd, passwd->len, - (caddr_t) &hmac_md5_hash); + (unsigned char *) &hmac_md5_hash); /* Copy the hash into the stream */ memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3, hmac_md5_hash, ISIS_AUTH_MD5_SIZE); @@ -2992,7 +2992,7 @@ build_psnp (int level, struct isis_circuit *circuit, struct list *lsps) hmac_md5 (STREAM_DATA (circuit->snd_stream), stream_get_endp(circuit->snd_stream), (unsigned char *) &passwd->passwd, passwd->len, - (caddr_t) &hmac_md5_hash); + (unsigned char *) &hmac_md5_hash); /* Copy the hash into the stream */ memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3, hmac_md5_hash, ISIS_AUTH_MD5_SIZE); diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c index 4bc8717a..463f5596 100644 --- a/isisd/isis_pfpacket.c +++ b/isisd/isis_pfpacket.c @@ -54,8 +54,8 @@ u_char ALL_L2_ISS[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x15 }; u_char ALL_ISS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x05 }; u_char ALL_ESS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x04 }; -static char discard_buff[8192]; -static char sock_buff[8192]; +static uint8_t discard_buff[8192]; +static uint8_t sock_buff[8192]; /* * if level is 0 we are joining p2p multicast |