--- ansh/src/utils.c 2011/10/13 16:08:52 1.1.1.1.2.8 +++ ansh/src/utils.c 2011/10/14 09:04:04 1.1.1.1.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: utils.c,v 1.1.1.1.2.8 2011/10/13 16:08:52 misho Exp $ + * $Id: utils.c,v 1.1.1.1.2.10 2011/10/14 09:04:04 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -277,7 +277,7 @@ icmpSend(int s, u_int seq, u_short id, char flg, u_int VERB(4) LOG("Put packet with len=%d", ret); if (ret != sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen) { VERB(3) LOG("Sended data %d is different from source data len %d", ret, - sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen); + (int) (sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen)); return ANSH_FLG_ERR; } @@ -285,7 +285,7 @@ icmpSend(int s, u_int seq, u_short id, char flg, u_int } static int -_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct ether_addr *ea) +_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct io_ether_addr *ea) { u_char *pos, buf[USHRT_MAX] = { 0 }; struct ether_header *e = (struct ether_header*) buf; @@ -297,7 +297,7 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u return ANSH_FLG_ERR; e->ether_type = ntohs(ANSH_ID); - memcpy(e->ether_dhost, ea->octet, ETHER_ADDR_LEN); + memcpy(e->ether_dhost, ea->ether_addr_octet, ETHER_ADDR_LEN); hdr = (struct ansh_hdr*) (buf + ETHER_HDR_LEN); pos = ((u_char*) hdr) + sizeof(struct ansh_hdr); @@ -318,7 +318,7 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u VERB(4) LOG("Put packet with len=%d", ret); if (ret != ETHER_HDR_LEN + sizeof(struct ansh_hdr) + datlen) { VERB(3) LOG("Sended data %d is different from source data len %d", ret, - ETHER_HDR_LEN + sizeof(struct ansh_hdr) + datlen); + (int) (ETHER_HDR_LEN + sizeof(struct ansh_hdr) + datlen)); return ANSH_FLG_ERR; } @@ -326,7 +326,7 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u } int -pktSend(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct ether_addr *ea) +pktSend(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct io_ether_addr *ea) { int wlen, ret = 0; u_char *pos = data; @@ -509,7 +509,7 @@ cryptBuffer(u_char *buf, int rlen, u_int ctr) memcpy(ivec + 8, &ctr, sizeof ctr); memcpy(ivec + 12, &rctr, sizeof rctr); - if (io_ctr_AES(buf, rlen, &str, (u_char*) "_ansh_ELWIX_", ivec) == -1) + if (io_ctr_AES(buf, rlen, &str, (u_char*) Key, ivec) == -1) return NULL; return str;