proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 20:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: fix signedness mix-ups

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 21401f3215be26dcb0f787105f5907745498e966)
This commit is contained in:
David Lamparter 2015-03-03 08:55:26 +01:00 committed by Donald Sharp
parent 8ecd326693
commit f2bce9a5b3
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
isisd/isis_bpf.c
View File

@ -302,13 +302,14 @@ int
isis_send_pdu_bcast (struct isis_circuit *circuit, int level) isis_send_pdu_bcast (struct isis_circuit *circuit, int level)
{ {
struct ether_header *eth; 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; buflen = stream_get_endp (circuit->snd_stream) + LLC_LEN + ETHER_HDR_LEN;
if (buflen > sizeof (sock_buff)) if (buflen > sizeof (sock_buff))
{ {
zlog_warn ("isis_send_pdu_bcast: sock_buff size %lu is less than " zlog_warn ("isis_send_pdu_bcast: sock_buff size %zu is less than "
"output pdu size %d on circuit %s", "output pdu size %zu on circuit %s",
sizeof (sock_buff), buflen, circuit->interface->name); sizeof (sock_buff), buflen, circuit->interface->name);
return ISIS_WARNING; return ISIS_WARNING;
} }

2
isisd/isis_lsp.c
View File

@ -393,7 +393,7 @@ lsp_auth_update (struct isis_lsp *lsp)
/* Compute autentication value */ /* Compute autentication value */
hmac_md5 (STREAM_DATA (lsp->pdu), stream_get_endp(lsp->pdu), hmac_md5 (STREAM_DATA (lsp->pdu), stream_get_endp(lsp->pdu),
(unsigned char *) &passwd->passwd, passwd->len, (unsigned char *) &passwd->passwd, passwd->len,
(caddr_t) &hmac_md5_hash); (unsigned char *) &hmac_md5_hash);
/* Copy the hash into the stream */ /* Copy the hash into the stream */
memcpy (STREAM_DATA (lsp->pdu) + lsp->auth_tlv_offset + 3, memcpy (STREAM_DATA (lsp->pdu) + lsp->auth_tlv_offset + 3,
hmac_md5_hash, ISIS_AUTH_MD5_SIZE); hmac_md5_hash, ISIS_AUTH_MD5_SIZE);

8
isisd/isis_pdu.c
View File

@ -204,7 +204,7 @@ authentication_check (struct isis_passwd *remote, struct isis_passwd *local,
/* Compute the digest */ /* Compute the digest */
hmac_md5 (STREAM_DATA (stream), stream_get_endp (stream), hmac_md5 (STREAM_DATA (stream), stream_get_endp (stream),
(unsigned char *) &(local->passwd), local->len, (unsigned char *) &(local->passwd), local->len,
(caddr_t) &digest); (unsigned char *) &digest);
/* Copy back the authentication value after the check */ /* Copy back the authentication value after the check */
memcpy (STREAM_DATA (stream) + auth_tlv_offset + 3, memcpy (STREAM_DATA (stream) + auth_tlv_offset + 3,
remote->passwd, ISIS_AUTH_MD5_SIZE); remote->passwd, ISIS_AUTH_MD5_SIZE);
@ -2416,7 +2416,7 @@ send_hello (struct isis_circuit *circuit, int level)
hmac_md5 (STREAM_DATA (circuit->snd_stream), hmac_md5 (STREAM_DATA (circuit->snd_stream),
stream_get_endp (circuit->snd_stream), stream_get_endp (circuit->snd_stream),
(unsigned char *) &circuit->passwd.passwd, circuit->passwd.len, (unsigned char *) &circuit->passwd.passwd, circuit->passwd.len,
(caddr_t) &hmac_md5_hash); (unsigned char *) &hmac_md5_hash);
/* Copy the hash into the stream */ /* Copy the hash into the stream */
memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3, memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3,
hmac_md5_hash, ISIS_AUTH_MD5_SIZE); hmac_md5_hash, ISIS_AUTH_MD5_SIZE);
@ -2614,7 +2614,7 @@ build_csnp (int level, u_char * start, u_char * stop, struct list *lsps,
hmac_md5 (STREAM_DATA (circuit->snd_stream), hmac_md5 (STREAM_DATA (circuit->snd_stream),
stream_get_endp(circuit->snd_stream), stream_get_endp(circuit->snd_stream),
(unsigned char *) &passwd->passwd, passwd->len, (unsigned char *) &passwd->passwd, passwd->len,
(caddr_t) &hmac_md5_hash); (unsigned char *) &hmac_md5_hash);
/* Copy the hash into the stream */ /* Copy the hash into the stream */
memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3, memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3,
hmac_md5_hash, ISIS_AUTH_MD5_SIZE); hmac_md5_hash, ISIS_AUTH_MD5_SIZE);
@ -2947,7 +2947,7 @@ build_psnp (int level, struct isis_circuit *circuit, struct list *lsps)
hmac_md5 (STREAM_DATA (circuit->snd_stream), hmac_md5 (STREAM_DATA (circuit->snd_stream),
stream_get_endp(circuit->snd_stream), stream_get_endp(circuit->snd_stream),
(unsigned char *) &passwd->passwd, passwd->len, (unsigned char *) &passwd->passwd, passwd->len,
(caddr_t) &hmac_md5_hash); (unsigned char *) &hmac_md5_hash);
/* Copy the hash into the stream */ /* Copy the hash into the stream */
memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3, memcpy (STREAM_DATA (circuit->snd_stream) + auth_tlv_offset + 3,
hmac_md5_hash, ISIS_AUTH_MD5_SIZE); hmac_md5_hash, ISIS_AUTH_MD5_SIZE);

4
isisd/isis_pfpacket.c
View File

@ -55,8 +55,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_ISS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x05 };
u_char ALL_ESS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x04 }; u_char ALL_ESS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x04 };
static char discard_buff[8192]; static uint8_t discard_buff[8192];
static char sock_buff[8192]; static uint8_t sock_buff[8192];
/* /*
* if level is 0 we are joining p2p multicast * if level is 0 we are joining p2p multicast

2
lib/md5.c
View File

@ -306,7 +306,7 @@ unsigned char* text; /* pointer to data stream */
int text_len; /* length of data stream */ int text_len; /* length of data stream */
unsigned char* key; /* pointer to authentication key */ unsigned char* key; /* pointer to authentication key */
int key_len; /* length of authentication key */ int key_len; /* length of authentication key */
caddr_t digest; /* caller digest to be filled in */ uint8_t* digest; /* caller digest to be filled in */
{ {
MD5_CTX context; MD5_CTX context;

2
lib/md5.h
View File

@ -84,6 +84,6 @@ do { \
/* From RFC 2104 */ /* From RFC 2104 */
void hmac_md5(unsigned char* text, int text_len, unsigned char* key, void hmac_md5(unsigned char* text, int text_len, unsigned char* key,
int key_len, caddr_t digest); int key_len, uint8_t *digest);
#endif /* ! _LIBZEBRA_MD5_H_*/ #endif /* ! _LIBZEBRA_MD5_H_*/