Merge pull request #489 from flu0r1ne/set-mark-during-address-selection

Set mark during address selection

packet/probe.h

@@ -69,7 +69,7 @@ struct probe_param_t {
     int type_of_service;
 
     /*  The packet "mark" used for mark-based routing on Linux  */
-    int routing_mark;
+    uint32_t routing_mark;
 
     /*  Time to live for the transmitted probe  */
     int ttl;

ui/net.c

@@ -687,8 +687,8 @@ static void net_find_interface_address_from_name(
   host by connecting a UDP socket and checking the address
   the socket is bound to.
 */
-static void net_find_local_address(
-    void)
+static
+void net_find_local_address(struct mtr_ctl * ctl)
 {
     int udp_socket;
     int addr_length;
@@ -700,6 +700,15 @@ static void net_find_local_address(
         error(EXIT_FAILURE, errno, "udp socket creation failed");
     }
 
+#ifdef SO_MARK
+    /* On Linux, the packet mark can affect the selection of the source address */
+    if(ctl->mark) {
+        if(setsockopt(udp_socket, SOL_SOCKET, SO_MARK, &ctl->mark, sizeof(ctl->mark))) {
+            error(EXIT_FAILURE, errno, "failed to set the packet mark");
+        }
+    }
+#endif
+
     /*
        We need to set the port to a non-zero value for the connect
        to succeed.
@@ -778,7 +787,7 @@ void net_reopen(
             &sourcesockaddr_struct, ctl->af, ctl->InterfaceName);
         inet_ntop(sourcesockaddr->sa_family, sourceaddress, localaddr, sizeof(localaddr));
     } else {
-        net_find_local_address();
+        net_find_local_address(ctl);
     }
 
 }

ui/utils.c

@@ -80,7 +80,7 @@ int strtonum_or_err(
 
     if (str != NULL && *str != '\0') {
         errno = 0;
-        num = strtoul(str, &end, 10);
+        num = strtoul(str, &end, 0);
         if (errno == 0 && str != end && end != NULL && *end == '\0') {
             switch (type) {
             case STRTO_INT: