Revision: 532
http://vde.svn.sourceforge.net/vde/?rev=532&view=rev
Author: danielel
Date: 2012-01-18 12:16:09 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
- Fixed UDP datagram sizes in sendto,recvfrom
- coherent time interval for olsr hello messages
Modified Paths:
--------------
branches/vde-router/vde-2/src/vde_router/vder_dhcp.c
branches/vde-router/vde-2/src/vde_router/vder_olsr.c
branches/vde-router/vde-2/src/vde_router/vder_udp.c
Modified: branches/vde-router/vde-2/src/vde_router/vder_dhcp.c
===================================================================
--- branches/vde-router/vde-2/src/vde_router/vder_dhcp.c 2012-01-17
12:41:27 UTC (rev 531)
+++ branches/vde-router/vde-2/src/vde_router/vder_dhcp.c 2012-01-18
12:16:09 UTC (rev 532)
@@ -70,7 +70,7 @@
return 0;
}
-#define DHCP_DATAGRAM_SIZE 308
+#define DHCP_DATAGRAM_SIZE 300
#define OPENDNS (htonl(0xd043dede))
static void dhcpd_make_reply(struct vder_dhcp_negotiation *dn, uint8_t
reply_type)
Modified: branches/vde-router/vde-2/src/vde_router/vder_olsr.c
===================================================================
--- branches/vde-router/vde-2/src/vde_router/vder_olsr.c 2012-01-17
12:41:27 UTC (rev 531)
+++ branches/vde-router/vde-2/src/vde_router/vder_olsr.c 2012-01-18
12:16:09 UTC (rev 532)
@@ -7,7 +7,7 @@
#include <sys/time.h>
-#define OLSR_MSG_INTERVAL 6000
+#define OLSR_MSG_INTERVAL 2000
struct olsr_route_entry
{
@@ -185,14 +185,17 @@
ohdr->len = htons(size);
ohdr->seq = htons(pkt_counter++);
- if ( 0 > vder_udpsocket_sendto_broadcast(udpsock, dgram, size + 8, vif,
bcast, OLSR_PORT) ) {
+ if ( 0 > vder_udpsocket_sendto_broadcast(udpsock, dgram, size, vif,
bcast, OLSR_PORT) ) {
perror("olsr send");
}
}
static void olsr_recv(uint8_t *buffer, int len)
{
+ struct olsrhdr *oh = (struct olsrhdr *) buffer;
+ //printf ("Received olsr msg, size: %d (%d)\n", len, ntohs(oh->len));
+
}
Modified: branches/vde-router/vde-2/src/vde_router/vder_udp.c
===================================================================
--- branches/vde-router/vde-2/src/vde_router/vder_udp.c 2012-01-17 12:41:27 UTC
(rev 531)
+++ branches/vde-router/vde-2/src/vde_router/vder_udp.c 2012-01-18 12:16:09 UTC
(rev 532)
@@ -90,6 +90,7 @@
errno = EINVAL;
return -1;
}
+ len += sizeof(struct udphdr);
ro = vder_get_route(dst);
if (!ro) {
@@ -127,6 +128,7 @@
errno = EINVAL;
return -1;
}
+ len += sizeof(struct udphdr);
bufsize = sizeof(struct vde_buff) + sizeof(struct vde_ethernet_header)
+ sizeof(struct iphdr) + sizeof(struct udphdr) + len;
b = malloc(bufsize);
@@ -176,7 +178,7 @@
uh = (struct udphdr *) payload(b);
datagram = (uint8_t *)(payload(b) + sizeof(struct udphdr));
if (ntohs(uh->len) < len)
- len = ntohs(uh->len);
+ len = ntohs(uh->len) - sizeof (struct udphdr);
memcpy(data, datagram, len);
*fromport = uh->sport;
return len;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
vde-users mailing list
vde-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vde-users
