projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More braces to make gcc happy.
[tinc]
/
src
/
route.c
diff --git
a/src/route.c
b/src/route.c
index
53cf2d5
..
261462e
100644
(file)
--- a/
src/route.c
+++ b/
src/route.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: route.c,v 1.1.2.
48 2003/03/29 21:58:35
guus Exp $
+ $Id: route.c,v 1.1.2.
51 2003/06/11 19:40:43
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-67,7
+67,8
@@
int routing_mode = RMODE_ROUTER;
int priorityinheritance = 0;
int macexpire = 600;
int routing_mode = RMODE_ROUTER;
int priorityinheritance = 0;
int macexpire = 600;
-subnet_t mymac;
+int overwrite_mac = 0;
+mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
/* RFC 1071 */
/* RFC 1071 */
@@
-76,10
+77,13
@@
uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
uint16_t *p = data;
uint32_t checksum = prevsum ^ 0xFFFF;
uint16_t *p = data;
uint32_t checksum = prevsum ^ 0xFFFF;
- len /= 2;
-
- while(len--)
+ while(len >= 2) {
checksum += *p++;
checksum += *p++;
+ len -= 2;
+ }
+
+ if(len)
+ checksum += *(unsigned char *)p;
while(checksum >> 16)
checksum = (checksum & 0xFFFF) + (checksum >> 16);
while(checksum >> 16)
checksum = (checksum & 0xFFFF) + (checksum >> 16);
@@
-394,7
+398,8
@@
void route_neighborsol(vpn_packet_t *packet)
/* First, snatch the source address from the neighbor solicitation packet */
/* First, snatch the source address from the neighbor solicitation packet */
- memcpy(mymac.net.mac.address.x, packet->data + 6, 6);
+ if(overwrite_mac)
+ memcpy(mymac.x, packet->data + 6, 6);
/* Check if this is a valid neighbor solicitation request */
/* Check if this is a valid neighbor solicitation request */
@@
-496,7
+501,8
@@
void route_arp(vpn_packet_t *packet)
/* First, snatch the source address from the ARP packet */
/* First, snatch the source address from the ARP packet */
- memcpy(mymac.net.mac.address.x, packet->data + 6, 6);
+ if(overwrite_mac)
+ memcpy(mymac.x, packet->data + 6, 6);
/* This routine generates replies to ARP requests.
You don't need to set NOARP flag on the interface anymore (which is broken on FreeBSD).
/* This routine generates replies to ARP requests.
You don't need to set NOARP flag on the interface anymore (which is broken on FreeBSD).
@@
-625,7
+631,8
@@
void route_incoming(node_t *source, vpn_packet_t *packet)
if(n) {
if(n == myself) {
if(n) {
if(n == myself) {
- memcpy(packet->data, mymac.net.mac.address.x, 6);
+ if(overwrite_mac)
+ memcpy(packet->data, mymac.x, 6);
write_packet(packet);
} else
send_packet(n, packet);
write_packet(packet);
} else
send_packet(n, packet);