ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.18 by pcg, Sat Oct 4 13:20:07 2003 UTC vs.
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
34#include "conf.h" 35#include "conf.h"
35#include "slog.h" 36#include "slog.h"
36#include "device.h" 37#include "device.h"
37#include "vpn.h" 38#include "vpn.h"
38#include "connection.h" 39#include "connection.h"
40
41#include "netcompat.h"
39 42
40#if !HAVE_RAND_PSEUDO_BYTES 43#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 44# define RAND_pseudo_bytes RAND_bytes
42#endif 45#endif
43 46
… …
798 reset_connection (); 801 reset_connection ();
799 establish_connection (); 802 establish_connection ();
800} 803}
801 804
802void 805void
803connection::send_data_packet (tap_packet *pkt, bool broadcast) 806connection::send_data_packet (tap_packet *pkt)
804{ 807{
805 vpndata_packet *p = new vpndata_packet; 808 vpndata_packet *p = new vpndata_packet;
806 int tos = 0; 809 int tos = 0;
807 810
808 // I am not hilarious about peeking into packets, but so be it. 811 // I am not hilarious about peeking into packets, but so be it.
809 if (conf->inherit_tos 812 if (conf->inherit_tos && pkt->is_ipv4 ())
810 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
811 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
812 tos = (*pkt)[15] & IPTOS_TOS_MASK; 813 tos = (*pkt)[15] & IPTOS_TOS_MASK;
813 814
814 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 815 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815 send_vpn_packet (p, si, tos); 816 send_vpn_packet (p, si, tos);
816 817
817 delete p; 818 delete p;
818 819
819 if (oseqno > MAX_SEQNO) 820 if (oseqno > MAX_SEQNO)
820 rekey (); 821 rekey ();
821} 822}
822 823
823void 824void
824connection::inject_data_packet (tap_packet *pkt, bool broadcast) 825connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
825{ 826{
826 if (ictx && octx) 827 if (ictx && octx)
827 send_data_packet (pkt, broadcast); 828 send_data_packet (pkt);
828 else 829 else
829 { 830 {
830 if (!broadcast)//DDDD 831 if (!broadcast)//DDDD
831 data_queue.put (new tap_packet (*pkt)); 832 data_queue.put (new tap_packet (*pkt));
832 833
… …
1035 1036
1036 if (iseqno.recv_ok (seqno)) 1037 if (iseqno.recv_ok (seqno))
1037 { 1038 {
1038 vpn->tap->send (d); 1039 vpn->tap->send (d);
1039 1040
1040 if (p->dst () == 0) // re-broadcast
1041 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1042 {
1043 connection *c = *i;
1044
1045 if (c->conf != THISNODE && c->conf != conf)
1046 c->inject_data_packet (d);
1047 }
1048
1049 if (si != rsi) 1041 if (si != rsi)
1050 { 1042 {
1051 // fast re-sync on connection changes, useful especially for tcp/ip 1043 // fast re-sync on connection changes, useful especially for tcp/ip
1052 si = rsi; 1044 si = rsi;
1053 1045

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines