[ViewVC] Diff of: cvs/gvpe/src/vpn.C

Comparing gvpe/src/vpn.C (file contents):
Revision 1.34 by pcg, Sat Mar 26 03:16:24 2005 UTC vs.
Revision 1.39 by pcg, Sat Nov 10 05:14:22 2007 UTC

     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "config.h"
 #include <list>
       if (ipv4_fd < 0)
         return -1;
       fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
 #if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
         {
           slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
           exit (EXIT_FAILURE);
         }
-      ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
+      ipv4_ev_watcher.start (ipv4_fd, EV_READ);
     }
   udpv4_fd = -1;
   if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
       if (udpv4_fd < 0)
         return -1;
       fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
       // standard daemon practise...
       {
         int oval = 1;
         setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
         {
           slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
           exit (EXIT_FAILURE);
         }
-      udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
+      udpv4_ev_watcher.start (udpv4_fd, EV_READ);
     }
   icmpv4_fd = -1;
 #if ENABLE_ICMP
       if (icmpv4_fd < 0)
         return -1;
       fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
 #ifdef ICMP_FILTER
       {
         icmp_filter oval;
         oval.data = 0xffffffff;
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
 #endif
       sockinfo si (THISNODE, PROT_ICMPv4);
         {
           slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
           exit (EXIT_FAILURE);
         }
-      icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
+      icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
     }
 #endif
   tcpv4_fd = -1;
       if (tcpv4_fd < 0)
         return -1;
       fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
       // standard daemon practise...
       {
         int oval = 1;
         setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
         {
           slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
           exit (EXIT_FAILURE);
         }
-      tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
+      tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
     }
 #endif
 #if ENABLE_DNS
   if (THISNODE->protocols & PROT_DNSv4)
       dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
       if (dnsv4_fd < 0)
         return -1;
+      fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
-#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
+# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
-#endif
+# endif
       // standard daemon practise...
       {
         int oval = 1;
         setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
         {
           slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
           exit (EXIT_FAILURE);
         }
-      dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
+      dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
     }
 #endif
   /////////////////////////////////////////////////////////////////////////////
     {
       slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
       exit (EXIT_FAILURE);
     }
+  fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
   if (tap->if_up () &&
       !run_script (run_script_cb (this, &vpn::script_if_init), true))
     {
       slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
             tap->if_up ());
     {
       slog (L_ERR, _("if-up command execution failed, exiting."));
       exit (EXIT_FAILURE);
     }
-  tap_ev_watcher.start (tap->fd, EVENT_READ);
+  tap_ev_watcher.start (tap->fd, EV_READ);
   return 0;
 }
 bool
   return false;
 }
 void
-vpn::ipv4_ev (io_watcher &w, short revents)
+vpn::ipv4_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
       socklen_t sa_len = sizeof (sa);
       int len;
     }
 }
 #if ENABLE_ICMP
 void
-vpn::icmpv4_ev (io_watcher &w, short revents)
+vpn::icmpv4_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
       socklen_t sa_len = sizeof (sa);
       int len;
     }
 }
 #endif
 void
-vpn::udpv4_ev (io_watcher &w, short revents)
+vpn::udpv4_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
       socklen_t sa_len = sizeof (sa);
       int len;
       exit (EXIT_FAILURE);
     }
 }
 void
-vpn::tap_ev (io_watcher &w, short revents)
+vpn::tap_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       /* process data */
       tap_packet *pkt;
       pkt = tap->recv ();
   else
     abort ();
 }
 void
-vpn::event_cb (time_watcher &w)
+vpn::event_cb (ev::timer &w, int)
 {
   if (events)
     {
       if (events & EVENT_SHUTDOWN)
         {
 }
 void
 vpn::dump_status ()
 {
-  slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW);
+  slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev::ev_now ());
   for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
     (*c)->dump_status ();
   slog (L_NOTICE, _("END status dump"));

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.34 by pcg, Sat Mar 26 03:16:24 2005 UTC vs. Revision 1.39 by pcg, Sat Nov 10 05:14:22 2007 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.34 by pcg, Sat Mar 26 03:16:24 2005 UTC vs.
Revision 1.39 by pcg, Sat Nov 10 05:14:22 2007 UTC