Add a filter function to enable bindhost to be device name, instead o…

src/config.c

@@ -22,6 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <ifaddrs.h>
 
 #include "includes.h"
 #include "mlvpn.h"
@@ -36,6 +37,11 @@ extern struct mlvpn_filters_s mlvpn_filters;
 extern struct tuntap_s tuntap;
 extern struct mlvpn_reorder_buffer *reorder_buffer;
 
+char *ip_from_if(char *ifname);
+// we'll declair this here, so that any device name used instead of an IP
+// address gets translated before we go anywhere else...
+
+
 /* Config file reading / re-read.
  * config_file_fd: fd opened in priv_open_config
  * first_time: set to 0 for re-read, or 1 for initial configuration
@@ -273,6 +279,7 @@ mlvpn_config(int config_file_fd, int first_time)
                 char *dstaddr;
                 char *dstport;
                 uint32_t bwlimit = 0;
+                uint32_t quota = 0;
                 uint32_t timeout = 30;
                 uint32_t loss_tolerence;
                 int create_tunnel = 1;
@@ -311,9 +318,16 @@ mlvpn_config(int config_file_fd, int first_time)
                         config, lastSection, "remoteport", &dstport, NULL,
                         "No remote port specified.\n", 1);
                 }
+
+                bindaddr=ip_from_if(bindaddr);
+
+
                 _conf_set_uint_from_conf(
                     config, lastSection, "bandwidth_upload", &bwlimit, 0,
                     NULL, 0);
+                _conf_set_uint_from_conf(
+                    config, lastSection, "quota", &quota, 0,
+                    NULL, 0);
                 _conf_set_uint_from_conf(
                     config, lastSection, "timeout", &timeout, default_timeout,
                     NULL, 0);
@@ -372,10 +386,16 @@ mlvpn_config(int config_file_fd, int first_time)
                         }
                         if (tmptun->bandwidth != bwlimit)
                         {
-                        log_info("config", "%s bandwidth changed from %d to %d",
+                          log_info("config", "%s bandwidth changed from %d to %d",
                                 tmptun->name, tmptun->bandwidth, bwlimit);
                             tmptun->bandwidth = bwlimit;
                         }
+                        if (tmptun->quota != quota)
+                        {
+                          log_info("config", "%s quota changed from %d to %d",
+                                tmptun->name, tmptun->quota, quota);
+                            tmptun->quota = quota;
+                        }
                         if (tmptun->loss_tolerence != loss_tolerence)
                         {
                             log_info("config", "%s loss tolerence changed from %d%% to %d%%",
@@ -393,7 +413,7 @@ mlvpn_config(int config_file_fd, int first_time)
                     mlvpn_rtun_new(
                         lastSection, bindaddr, bindport, bindfib, dstaddr, dstport,
                         default_server_mode, timeout, fallback_only,
-                        bwlimit, loss_tolerence);
+                        bwlimit, loss_tolerence, quota);
                 }
                 if (bindaddr)
                     free(bindaddr);
@@ -486,3 +506,43 @@ mlvpn_config(int config_file_fd, int first_time)
     log_warnx("config", "parse error");
     return 1;
 }
+
+
+/* This is a filter function, it takes an name, if the name turns out to be an
+ * interface, it translates it to it's IP address,
+ * the resulting filtered name is returned (whether it has matched an interface
+ * or not */
+char *ip_from_if(char *ifname) 
+{
+
+    struct ifaddrs *ifaddr, *ifa;
+    int s;
+    char host[NI_MAXHOST];
+
+    if (getifaddrs(&ifaddr) == -1) 
+    {
+      log_warn(NULL, "unable to collect ifaddrs");
+      return ifname;
+    }
+
+
+    for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) 
+    {
+        if (ifa->ifa_addr == NULL)
+            continue;  
+
+        s=getnameinfo(ifa->ifa_addr,sizeof(struct sockaddr_in),host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+
+        if((strcmp(ifa->ifa_name,ifname)==0)&&(ifa->ifa_addr->sa_family==AF_INET))
+        {
+            if (s == 0)
+            {
+              if (ifname) free(ifname);
+              ifname = strdup(host);
+            }
+        }
+    }
+
+    freeifaddrs(ifaddr);
+    return ifname;
+}

src/control.c

@@ -68,9 +68,11 @@ void mlvpn_control_write_status(struct mlvpn_control *ctrl);
     "   \"bandwidth\": %u,\n" \
     "   \"srtt\": %u,\n" \
     "   \"loss\": %u,\n" \
+    "   \"permitted\": %u,\n" \
     "   \"disconnects\": %u,\n" \
     "   \"last_packet\": %u,\n" \
-    "   \"timeout\": %u\n" \
+    "   \"timeout\": %u,\n" \
+    "   \"weight\": %.3f\n" \
     "}%s\n"
 #define JSON_STATUS_ERROR_UNKNOWN_COMMAND "{\"error\": 'unknown command'}\n"
 
@@ -428,9 +430,11 @@ void mlvpn_control_write_status(struct mlvpn_control *ctrl)
                        0,
                        (uint32_t)t->srtt,
                        mlvpn_loss_ratio(t),
+                       (uint32_t)(t->permitted/1000000),
                        t->disconnects,
                        (uint32_t)t->last_activity,
                        (uint32_t)t->timeout,
+                       t->weight,
                        (LIST_NEXT(t, entries) ? "," : "")
                       );
         mlvpn_control_write(ctrl, buf, ret);