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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.52 by pcg, Sun Aug 10 22:18:58 2008 UTC vs.
Revision 1.55 by pcg, Fri Mar 27 22:02:57 2009 UTC

   return filename;
 }
 int
+vpn::setup_socket (u8 prot, int family, int type, int proto)
+{
+  int fd = socket (family, type, proto);
+  if (fd < 0)
+    {
+      slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
+      return fd;
+    }
+  fcntl (fd, F_SETFL, O_NONBLOCK);
+  fcntl (fd, F_SETFD, FD_CLOEXEC);
+#ifdef SO_MARK
+  if (::conf.nfmark)
+    if (setsockopt (fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark))
+      slog (L_WARN, _("unable to set nfmark on %s socket: %s"), strprotocol (prot), strerror (errno));
+#endif
+  return fd;
+}
+int
 vpn::setup ()
 {
   int success = 0;
   ipv4_tos = -1;
   ipv4_fd  = -1;
   if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
     {
-      ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
+      ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
       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.
       sockinfo si (THISNODE, PROT_IPv4);
       if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
-          exit (EXIT_FAILURE);
+          return -1;
         }
       ipv4_ev_watcher.start (ipv4_fd, EV_READ);
       ++success;
     }
   udpv4_tos = -1;
   udpv4_fd  = -1;
   if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
     {
-      udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+      udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
       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);
       sockinfo si (THISNODE, PROT_UDPv4);
       if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
-          exit (EXIT_FAILURE);
+          return -1;
         }
       udpv4_ev_watcher.start (udpv4_fd, EV_READ);
       ++success;
     }
   icmpv4_fd  = -1;
 #if ENABLE_ICMP
   if (THISNODE->protocols & PROT_ICMPv4)
     {
-      icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
+      icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_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;
       sockinfo si (THISNODE, PROT_ICMPv4);
       if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
-          exit (EXIT_FAILURE);
+          return -1;
         }
       icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
       ++success;
     }
   tcpv4_fd = -1;
 #if ENABLE_TCP
   if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
     {
-      tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
+      tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
       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);
       }
       sockinfo si (THISNODE, PROT_TCPv4);
       if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
-          exit (EXIT_FAILURE);
+          return -1;
         }
       if (listen (tcpv4_fd, 5))
         {
           slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
-          exit (EXIT_FAILURE);
+          return -1;
         }
       tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
       ++success;
     }
 #if ENABLE_DNS
   if (THISNODE->protocols & PROT_DNSv4)
     {
       dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
-      dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+      dnsv4_fd = setup_socket (PROT_DNSv4, 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)
       // 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.
                    PROT_DNSv4);
       if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
-          exit (EXIT_FAILURE);
+          return -1;
         }
       dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
       ++success;
     }
   /////////////////////////////////////////////////////////////////////////////
   if (!success)
     {
-      slog (L_ERR, _("no protocols enabled, exiting."));
+      slog (L_ERR, _("no protocols enabled."));
-      exit (EXIT_FAILURE);
+      return -1;
     }
   reconnect_all ();
   /////////////////////////////////////////////////////////////////////////////
   tap = new tap_device ();
   if (!tap) //D this, of course, never catches
     {
-      slog (L_ERR, _("cannot create network interface '%s', exiting."), conf.ifname);
+      slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
-      exit (EXIT_FAILURE);
+      return -1;
     }
   fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
   run_script_cb cb;
   cb.set<vpn, &vpn::script_if_init> (this);
   if (tap->if_up () &&
       !run_script (cb, true))
     {
-      slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
+      slog (L_ERR, _("interface initialization command '%s' failed."),
             tap->if_up ());
-      exit (EXIT_FAILURE);
+      return -1;
     }
   cb.set<vpn, &vpn::script_if_up> (this);
   if (!run_script (cb, true))
     {
-      slog (L_ERR, _("if-up command execution failed, exiting."));
+      slog (L_ERR, _("if-up command execution failed."));
-      exit (EXIT_FAILURE);
+      return -1;
     }
   tap_ev_watcher.start (tap->fd, EV_READ);
   return 0;
 {
   connection *r = find_router_for (c);
   if (r)
     {
-      slog (L_TRACE, _("%s: no way to connect, sending mediated connection request via %s."),
+      slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
             c->conf->nodename, r->conf->nodename);
       r->send_connect_request (c->conf->id);
     }
   else
-    slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect."),
+    slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
           c->conf->nodename);
 }
 void
 connection::dump_status ()

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.52 by pcg, Sun Aug 10 22:18:58 2008 UTC vs. Revision 1.55 by pcg, Fri Mar 27 22:02:57 2009 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.52 by pcg, Sun Aug 10 22:18:58 2008 UTC vs.
Revision 1.55 by pcg, Fri Mar 27 22:02:57 2009 UTC