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.20 by pcg, Tue Oct 14 15:48:15 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.
800 reset_connection (); 801 reset_connection ();
801 establish_connection (); 802 establish_connection ();
802} 803}
803 804
804void 805void
805connection::send_data_packet (tap_packet *pkt, bool broadcast) 806connection::send_data_packet (tap_packet *pkt)
806{ 807{
807 vpndata_packet *p = new vpndata_packet; 808 vpndata_packet *p = new vpndata_packet;
808 int tos = 0; 809 int tos = 0;
809 810
810 // 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.
811 if (conf->inherit_tos 812 if (conf->inherit_tos && pkt->is_ipv4 ())
812 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
813 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
814 tos = (*pkt)[15] & IPTOS_TOS_MASK; 813 tos = (*pkt)[15] & IPTOS_TOS_MASK;
815 814
816 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
817 send_vpn_packet (p, si, tos); 816 send_vpn_packet (p, si, tos);
818 817
819 delete p; 818 delete p;
820 819
821 if (oseqno > MAX_SEQNO) 820 if (oseqno > MAX_SEQNO)
822 rekey (); 821 rekey ();
823} 822}
824 823
825void 824void
826connection::inject_data_packet (tap_packet *pkt, bool broadcast) 825connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
827{ 826{
828 if (ictx && octx) 827 if (ictx && octx)
829 send_data_packet (pkt, broadcast); 828 send_data_packet (pkt);
830 else 829 else
831 { 830 {
832 if (!broadcast)//DDDD 831 if (!broadcast)//DDDD
833 data_queue.put (new tap_packet (*pkt)); 832 data_queue.put (new tap_packet (*pkt));
834 833
1037 1036
1038 if (iseqno.recv_ok (seqno)) 1037 if (iseqno.recv_ok (seqno))
1039 { 1038 {
1040 vpn->tap->send (d); 1039 vpn->tap->send (d);
1041 1040
1042 if (p->dst () == 0) // re-broadcast
1043 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1044 {
1045 connection *c = *i;
1046
1047 if (c->conf != THISNODE && c->conf != conf)
1048 c->inject_data_packet (d);
1049 }
1050
1051 if (si != rsi) 1041 if (si != rsi)
1052 { 1042 {
1053 // fast re-sync on connection changes, useful especially for tcp/ip 1043 // fast re-sync on connection changes, useful especially for tcp/ip
1054 si = rsi; 1044 si = rsi;
1055 1045

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines