From a51c00678a0cd8fe5d0bac6b78a9a0e260eb2d5d Mon Sep 17 00:00:00 2001
From: armatusmiles <akurotych@gmail.com>
Date: Fri, 11 Jan 2019 21:59:47 +0700
Subject: [PATCH] [*] Fix warnings
---
.travis.yml | 3 ++-
core/unix/dap_network_monitor.c | 1 +
test/core/unix/dap_network_monitor_test.c | 10 +++++-----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f4b36a0..eb6092d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
sudo: required
language: cpp
compiler: gcc
-dist: trusty
+dist: xenial
notifications:
email: false
@@ -10,6 +10,7 @@ before_install:
- git submodule update --recursive
script:
+ - sudo service network-manager start
- export CC=gcc-5
- mkdir build
- cd build
diff --git a/core/unix/dap_network_monitor.c b/core/unix/dap_network_monitor.c
index d84dfe7..aa0d916 100644
--- a/core/unix/dap_network_monitor.c
+++ b/core/unix/dap_network_monitor.c
@@ -182,4 +182,5 @@ static void* network_monitor_worker(void *arg)
}
}
}
+ return NULL;
}
diff --git a/test/core/unix/dap_network_monitor_test.c b/test/core/unix/dap_network_monitor_test.c
index 07d7d92..240b8a7 100644
--- a/test/core/unix/dap_network_monitor_test.c
+++ b/test/core/unix/dap_network_monitor_test.c
@@ -84,7 +84,7 @@ void _network_callback(const dap_network_notification_t result)
// result.route.s_gateway_address);
} else if (result.type == IP_ROUTE_ADD) {
- if(result.route.gateway_address != -1) { // gateway address is present
+ if(result.route.gateway_address != (uint64_t) -1) { // gateway address is present
dap_test_msg("Checking new gateway addr");
dap_assert(result.route.gateway_address ==
_test_event_cases[NEW_GATEWAY_EV].route.gateway_address,
@@ -164,12 +164,12 @@ void dap_network_monitor_test_run(void)
dap_network_monitor_init(_network_callback);
- const char *add_test_interfece = "nmcli connection add type tun con-name "
+ const char *add_test_interfece = "sudo nmcli connection add type tun con-name "
"DiveVPNTest autoconnect false ifname tun10 "
"mode tun ip4 10.1.0.111 gw4 10.1.0.1";
- const char *up_test_interfece = "nmcli connection up DiveVPNTest";
- const char *down_test_interfece = "nmcli connection down DiveVPNTest";
- const char *delete_test_interfece = "nmcli connection delete DiveVPNTest 2> /dev/null";
+ const char *up_test_interfece = "sudo nmcli connection up DiveVPNTest";
+ const char *down_test_interfece = "sudo nmcli connection down DiveVPNTest";
+ const char *delete_test_interfece = "sudo nmcli connection delete DiveVPNTest 2> /dev/null";
system(delete_test_interfece);
system(add_test_interfece);
--
GitLab