projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If "PriorityInheritance = yes" is specified in tinc.conf, the value of the
[tinc]
/
src
/
route.c
diff --git
a/src/route.c
b/src/route.c
index
1ac3e12
..
a6790c9
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.2
3 2002/02/18 16:25:19
guus Exp $
+ $Id: route.c,v 1.1.2.2
5 2002/03/01 12:26:56
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-51,6
+51,7
@@
#include "system.h"
int routing_mode = RMODE_ROUTER;
#include "system.h"
int routing_mode = RMODE_ROUTER;
+int priorityinheritance = 0;
subnet_t mymac;
void learn_mac(mac_t *address)
subnet_t mymac;
void learn_mac(mac_t *address)
@@
-107,6
+108,9
@@
node_t *route_ipv4(vpn_packet_t *packet)
{
subnet_t *subnet;
cp
{
subnet_t *subnet;
cp
+ if(priorityinheritance)
+ packet->priority = packet->data[15];
+
subnet = lookup_subnet_ipv4((ipv4_t *)&packet->data[30]);
cp
if(!subnet)
subnet = lookup_subnet_ipv4((ipv4_t *)&packet->data[30]);
cp
if(!subnet)
@@
-269,8
+273,22
@@
void route_incoming(node_t *source, vpn_packet_t *packet)
switch(routing_mode)
{
case RMODE_ROUTER:
switch(routing_mode)
{
case RMODE_ROUTER:
- memcpy(packet->data, mymac.net.mac.address.x, 6); /* Override destination address to make the kernel accept it */
- write_packet(packet);
+ {
+ node_t *n;
+
+ n = route_ipv4(packet);
+
+ if(n)
+ {
+ if(n == myself)
+ {
+ memcpy(packet->data, mymac.net.mac.address.x, 6);
+ write_packet(packet);
+ }
+ else
+ send_packet(n, packet);
+ }
+ }
break;
case RMODE_SWITCH:
{
break;
case RMODE_SWITCH:
{