NATMap: Add fwmark.

README.md

@@ -48,6 +48,7 @@ Options:
  -s <addr>[:port]    domain name or address of STUN server
  -h <addr>[:port]    domain name or address of HTTP server
  -e <path>           script path for notify mapped address
+ -f <mark>           fwmark value
 
 Bind options:
  -b <port>           port number for binding

src/hev-conf.c

@@ -21,6 +21,7 @@ static int type = AF_UNSPEC;
 static int keep;
 static int dmon;
 static int tmsec;
+static unsigned int mark;
 
 static char mport[16];
 static char sport[16] = "3478";
@@ -52,6 +53,7 @@ hev_conf_help (void)
         " -s <addr>[:port]    domain name or address of STUN server\n"
         " -h <addr>[:port]    domain name or address of HTTP server\n"
         " -e <path>           script path for notify mapped address\n"
+        " -f <mark>           fwmark value\n"
         "\n"
         "Bind options:\n"
         " -b <port>           port number for binding\n"
@@ -69,7 +71,7 @@ hev_conf_init (int argc, char *argv[])
 {
     int opt;
 
-    while ((opt = getopt (argc, argv, "46udk:s:h:e:b:T:t:p:i:")) != -1) {
+    while ((opt = getopt (argc, argv, "46udk:s:h:e:f:b:T:t:p:i:")) != -1) {
         switch (opt) {
         case '4':
             type = AF_INET;
@@ -95,6 +97,9 @@ hev_conf_init (int argc, char *argv[])
         case 'e':
             path = optarg;
             break;
+        case 'f':
+            mark = strtoul (optarg, NULL, 16);
+            break;
         case 'b':
             bport = optarg;
             break;
@@ -181,6 +186,12 @@ hev_conf_path (void)
     return path;
 }
 
+unsigned int
+hev_conf_mark (void)
+{
+    return mark;
+}
+
 const char *
 hev_conf_baddr (void)
 {

src/hev-conf.h

@@ -84,6 +84,15 @@ const char *hev_conf_http (void);
  */
 const char *hev_conf_path (void);
 
+/**
+ * hev_conf_mark:
+ *
+ * Get the fwmark value.
+ *
+ * Returns: returns string.
+ */
+unsigned int hev_conf_mark (void);
+
 /**
  * hev_conf_baddr:
  *

src/hev-sock.c

@@ -104,9 +104,21 @@ bind_iface (int fd, int family, const char *iface)
     return -1;
 }
 
+static int
+bind_fwmark (int fd, unsigned int mark)
+{
+#if defined(__linux__)
+    return setsockopt (fd, SOL_SOCKET, SO_MARK, &mark, sizeof (mark));
+#elif defined(__FreeBSD__)
+    return setsockopt (fd, SOL_SOCKET, SO_USER_COOKIE, &mark, sizeof (mark));
+#endif
+    return 0;
+}
+
 int
 hev_sock_client_tcp (int family, const char *saddr, const char *sport,
-                     const char *daddr, const char *dport, const char *iface)
+                     const char *daddr, const char *dport, const char *iface,
+                     unsigned int mark)
 {
     struct addrinfo *sai;
     struct addrinfo *dai;
@@ -136,6 +148,9 @@ hev_sock_client_tcp (int family, const char *saddr, const char *sport,
     }
 
     res = bind_iface (fd, sai->ai_family, iface);
+    if (mark) {
+        res |= bind_fwmark (fd, mark);
+    }
     if (res < 0) {
         LOG (E);
         freeaddrinfo (sai);
@@ -181,7 +196,7 @@ hev_sock_client_tcp (int family, const char *saddr, const char *sport,
 
 int
 hev_sock_client_udp (int family, const char *saddr, const char *sport,
-                     const char *iface)
+                     const char *iface, unsigned int mark)
 {
     struct addrinfo *sai;
     int res;
@@ -201,6 +216,9 @@ hev_sock_client_udp (int family, const char *saddr, const char *sport,
     }
 
     res = bind_iface (fd, sai->ai_family, iface);
+    if (mark) {
+        res |= bind_fwmark (fd, mark);
+    }
     if (res < 0) {
         LOG (E);
         freeaddrinfo (sai);
@@ -226,7 +244,8 @@ hev_sock_client_udp (int family, const char *saddr, const char *sport,
 
 int
 hev_sock_client_stun (int fd, int type, const char *daddr, const char *dport,
-                      const char *iface, unsigned int baddr[4], int *bport)
+                      const char *iface, unsigned int mark,
+                      unsigned int baddr[4], int *bport)
 {
     struct addrinfo sai;
     struct addrinfo *dai;
@@ -258,6 +277,9 @@ hev_sock_client_stun (int fd, int type, const char *daddr, const char *dport,
     }
 
     res = bind_iface (fd, sai.ai_family, iface);
+    if (mark) {
+        res |= bind_fwmark (fd, mark);
+    }
     if (res < 0) {
         LOG (E);
         freeaddrinfo (dai);

src/hev-sock.h

@@ -18,28 +18,30 @@
  * @daddr: destination addr
  * @dport: destination port
  * @iface: network interface
+ * @mark: fwmark
  *
  * Create a socket for TCP client.
  *
  * Returns: returns file descriptor on successful, otherwise returns -1.
  */
 int hev_sock_client_tcp (int family, const char *saddr, const char *sport,
                          const char *daddr, const char *dport,
-                         const char *iface);
+                         const char *iface, unsigned int mark);
 
 /**
  * hev_sock_client_udp:
  * @family: network family
  * @saddr: source addr
  * @sport: source port
  * @iface: network interface
+ * @mark: fwmark
  *
  * Create a socket for UDP client.
  *
  * Returns: returns file descriptor on successful, otherwise returns -1.
  */
 int hev_sock_client_udp (int family, const char *saddr, const char *sport,
-                         const char *iface);
+                         const char *iface, unsigned int mark);
 
 /**
  * hev_sock_client_stun:
@@ -48,6 +50,7 @@ int hev_sock_client_udp (int family, const char *saddr, const char *sport,
  * @daddr: destination addr
  * @dport: destination port
  * @iface: network interface
+ * @mark: fwmark
  * @baddr: [out] bound addr
  * @bport: [out] bound port
  *
@@ -57,7 +60,7 @@ int hev_sock_client_udp (int family, const char *saddr, const char *sport,
  */
 int hev_sock_client_stun (int fd, int type, const char *daddr,
                           const char *dport, const char *iface,
-                          unsigned int baddr[4], int *bport);
+                          unsigned int mark, unsigned int baddr[4], int *bport);
 
 /**
  * hev_sock_client_pfwd:

src/hev-stun.c

@@ -284,6 +284,7 @@ task_entry (void *data)
     const char *iface;
     const char *stun;
     const char *sport;
+    unsigned int mark;
     int bport;
     int mode;
     int tfd;
@@ -295,8 +296,10 @@ task_entry (void *data)
     stun = hev_conf_stun ();
     sport = hev_conf_sport ();
     iface = hev_conf_iface ();
+    mark = hev_conf_mark ();
 
-    fd = hev_sock_client_stun (tfd, mode, stun, sport, iface, baddr, &bport);
+    fd = hev_sock_client_stun (tfd, mode, stun, sport, iface, mark, baddr,
+                               &bport);
     close (tfd);
     if (fd < 0) {
         LOGV (E, "%s", "Start STUN service failed.");

src/hev-tnsk.c

@@ -90,6 +90,7 @@ tnsk_run (void)
     const char *port;
     const char *hport;
     const char *iface;
+    unsigned int mark;
     int type;
 
     type = hev_conf_type ();
@@ -99,8 +100,9 @@ tnsk_run (void)
     port = hev_conf_bport ();
     hport = hev_conf_hport ();
     iface = hev_conf_iface ();
+    mark = hev_conf_mark ();
 
-    fd = hev_sock_client_tcp (type, addr, port, http, hport, iface);
+    fd = hev_sock_client_tcp (type, addr, port, http, hport, iface, mark);
     if (fd < 0) {
         LOGV (E, "%s", "Start TCP keep-alive service failed.");
         return;

src/hev-unsk.c

@@ -57,16 +57,18 @@ unsk_run (void)
     const char *addr;
     const char *port;
     const char *iface;
+    unsigned int mark;
     int type;
 
     type = hev_conf_type ();
     ufwd = hev_conf_taddr ();
     addr = hev_conf_baddr ();
     port = hev_conf_bport ();
     iface = hev_conf_iface ();
+    mark = hev_conf_mark ();
     timeout = hev_conf_keep ();
 
-    fd = hev_sock_client_udp (type, addr, port, iface);
+    fd = hev_sock_client_udp (type, addr, port, iface, mark);
     if (fd < 0) {
         LOGV (E, "%s", "Start UDP keep-alive service failed.");
         return;