adjust version info

remove file:
install_manifest.txt

.gitignore

@@ -37,6 +37,7 @@ CMakeFiles/
 CMakeCache.txt
 Makefile
 cmake_install.cmake
+install_manifest.txt
 
 # bin generated
 xfrpc

commandline.c

@@ -165,7 +165,7 @@ parse_commandline(int argc, char **argv)
             break;
 
         case 'v':
-            fprintf(stdout, "This is %s version " VERSION "\n", argv[0]);
+            fprintf(stdout, "version: " VERSION "\n");
             exit(1);
             break;
 

config.c

@@ -71,6 +71,8 @@ void set_common_server_ip(const char *ip)
 	struct common_conf *c_conf = get_common_config();
 	c_conf->server_ip = strdup(ip);
 	assert(c_conf->server_ip);
+
+	debug(LOG_DEBUG, "server IP address: [%s]", c_conf->server_ip);
 }
 
 void free_base_config(struct base_conf *bconf)

control.c

@@ -317,11 +317,12 @@ static void sync_new_work_connection(struct bufferevent *bev)
 	SAFE_FREE(work_c);
 }
 
-struct bufferevent *connect_server(struct event_base *base, const char *name, const int port)
+struct bufferevent *
+connect_server(struct event_base *base, const char *name, const int port)
 {
 	struct bufferevent *bev = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE);
 	assert(bev);
-	
+
 	if (bufferevent_socket_connect_hostname(bev, 
 		main_ctl->dnsbase, 
 		AF_INET, 
@@ -800,7 +801,7 @@ static void keep_control_alive()
 static void server_dns_cb(int event_code, struct evutil_addrinfo *addr, void *ctx)
 {
     if (event_code) {
-        set_common_server_ip(evutil_gai_strerror(event_code));
+        set_common_server_ip((const char *)evutil_gai_strerror(event_code));
     } else {
         struct evutil_addrinfo *ai;
         if (addr->ai_canonname)
@@ -815,10 +816,10 @@ static void server_dns_cb(int event_code, struct evutil_addrinfo *addr, void *ct
                 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)ai->ai_addr;
                 s = evutil_inet_ntop(AF_INET6, &sin6->sin6_addr, buf, 128);
             }
-            if (s)
-                set_common_server_ip(s);
+
+            if (s) set_common_server_ip(s);
         }
-        evutil_freeaddrinfo(addr);
+        if (addr) evutil_freeaddrinfo(addr);
     }
 }
 
@@ -1011,33 +1012,7 @@ void init_main_control()
 
 	main_ctl = calloc(sizeof(struct control), 1);
 	assert(main_ctl);
-	struct event_base *base = NULL;
-	struct evdns_base *dnsbase  = NULL; 
-	base = event_base_new();
-	if (! base) {
-		debug(LOG_ERR, "error: event base init failed!");
-		exit(0);
-	}
 
-	dnsbase = evdns_base_new(base, 1);
-	if (! dnsbase) {
-		debug(LOG_ERR, "error: evdns base init failed!");
-		exit(0);
-	}
-
-	evdns_base_set_option(dnsbase, "timeout", "1.0");
-
-    // thanks to the following article
-    // http://www.wuqiong.info/archives/13/
-    evdns_base_set_option(dnsbase, "randomize-case:", "0");		//TurnOff DNS-0x20 encoding
-    evdns_base_nameserver_ip_add(dnsbase, "180.76.76.76");		//BaiduDNS
-    evdns_base_nameserver_ip_add(dnsbase, "223.5.5.5");			//AliDNS
-    evdns_base_nameserver_ip_add(dnsbase, "223.6.6.6");			//AliDNS
-    evdns_base_nameserver_ip_add(dnsbase, "114.114.114.114");	//114DNS
-
-	main_ctl->connect_base = base;
-	main_ctl->dnsbase = dnsbase;
-	
 	struct common_conf *c_conf = get_common_config();
 	if (c_conf->tcp_mux) {
 		uint32_t *sid = init_sid_index();
@@ -1047,11 +1022,39 @@ void init_main_control()
 		debug(LOG_DEBUG, "Connect Frps with control session ID: %d", main_ctl->session_id);
 	}
 
+	struct event_base *base = NULL;
+	struct evdns_base *dnsbase = NULL; 
+	base = event_base_new();
+	if (! base) {
+		debug(LOG_ERR, "error: event base init failed!");
+		exit(0);
+	}
+	main_ctl->connect_base = base;
+
+	dnsbase = evdns_base_new(base, 1);
+	if (! dnsbase) {
+		debug(LOG_ERR, "error: evdns base init failed!");
+		exit(0);
+	}
+	main_ctl->dnsbase = dnsbase;
+
+	evdns_base_set_option(dnsbase, "timeout", "1.0");
+
+    // thanks to the following article
+    // http://www.wuqiong.info/archives/13/
+    evdns_base_set_option(dnsbase, "randomize-case:", "0");		//TurnOff DNS-0x20 encoding
+    evdns_base_nameserver_ip_add(dnsbase, "180.76.76.76");		//BaiduDNS
+	evdns_base_nameserver_ip_add(dnsbase, "223.5.5.5");			//AliDNS
+    evdns_base_nameserver_ip_add(dnsbase, "223.6.6.6");			//AliDNS
+	evdns_base_nameserver_ip_add(dnsbase, "114.114.114.114");	//114DNS
+
 	// if server_addr is ip, done control init.
 	if (is_valid_ip_address((const char *)c_conf->server_addr))
 		return;
 	
 	// if server_addr is domain, analyze it to ip for server_ip
+	debug(LOG_DEBUG, "Get ip address of [%s] from DNServer", c_conf->server_addr);
+
 	struct evutil_addrinfo hints;
 	struct evdns_getaddrinfo_request *dns_req;
 	memset(&hints, 0, sizeof(hints));
@@ -1067,7 +1070,7 @@ void init_main_control()
 							server_dns_cb, 
 							NULL);
 	if (! dns_req) {
-		debug(LOG_ERR, "error: can not analyse the dns of %s", c_conf->server_addr);
+		debug(LOG_ERR, "error: can not analyse the dns of [%s]", c_conf->server_addr);
 		exit(0);
 	}
 }

install_manifest.txt

@@ -1,2 +0,0 @@
-/usr/bin/xfrpc
-/usr/bin/xfrp_test_server

login.c

@@ -15,6 +15,7 @@
 #include "msg.h"
 #include "version.h"
 #include "login.h"
+#include "utils.h"
 
 static struct login 		*c_login;
 
@@ -37,12 +38,12 @@ void init_login()
 {
 	if (! c_login) 
 		c_login = calloc(sizeof(struct login), 1);
-		
+
 	assert(c_login);
 
 	struct common_conf *c_conf = get_common_config();
 	assert(c_conf);
-	
+
 	struct utsname uname_buf;
 	if (uname(&uname_buf)) {
 		return;
@@ -64,6 +65,22 @@ void init_login()
 	c_login->user			= c_conf->user;
 
 	c_login->logged 		= 0;
+
+	/* start to init login->run_id */
+	char ifname[16] = {0};
+	if(get_net_ifname(ifname, 16)){
+		debug(LOG_ERR, "error: get device sign ifname failed!");
+		exit(0);
+	}
+
+	char if_mac[64] = {0};
+	if(get_net_mac(ifname, if_mac, sizeof(if_mac))) {
+		debug(LOG_ERR, "error: Hard ware MAC address of [%s] get failed!", ifname);
+		exit(0);
+	}
+
+	c_login->run_id = strdup(if_mac);
+	assert(c_login->run_id);
 }
 
 int login_resp_check(struct login_resp *lr)

utils.c

@@ -8,6 +8,14 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <ifaddrs.h>
+#include <linux/if_link.h>
+
 #include "utils.h"
 
 // s_sleep using select instead of sleep
@@ -28,4 +36,148 @@ int is_valid_ip_address(const char *ip_address)
     struct sockaddr_in sa;
     int result = inet_pton(AF_INET, ip_address, &(sa.sin_addr));
 	return result;
+}
+
+//	net_if_name: name of network interface, e.g. br-lan
+//	return: 1: error 0:get succeed
+int get_net_mac(char *net_if_name, char *mac, int mac_len) {
+	int ret = 1;
+	int i = 0;
+	int sock = 0;
+
+	if (mac_len < 12 || net_if_name == NULL) {
+		return 1;
+	}
+	struct ifreq ifreq;
+
+	sock = socket(AF_INET, SOCK_STREAM, 0);
+	if( sock < 0 ) {
+		perror("error sock");
+		goto OUT;
+	}
+
+	strncpy(ifreq.ifr_name, net_if_name, IFNAMSIZ);
+	if( ioctl(sock, SIOCGIFHWADDR,&ifreq) < 0 ) {
+		perror("error ioctl");
+		goto OUT;
+	}
+
+	for( i = 0; i < 6; i++ ){
+		snprintf(mac+2*i, mac_len - 2*i, "%02X", 
+			(unsigned char)ifreq.ifr_hwaddr.sa_data[i]);
+	}
+	mac[strlen(mac)] = 0;
+	ret =  0;
+
+OUT:
+	close(sock);
+	return ret;
+}
+
+// return: -1: network interface check failed; other: ifname numbers 
+int show_net_ifname()
+{
+	struct ifaddrs *ifaddr, *ifa;
+	int family, s, n;
+	char host[NI_MAXHOST];
+
+	if (getifaddrs(&ifaddr) == -1) {
+	   perror("getifaddrs");
+	   exit(EXIT_FAILURE);
+	}
+
+	/* Walk through linked list, maintaining head pointer so we
+	  can free list later */
+
+	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
+	    if (ifa->ifa_addr == NULL) continue;
+
+	    family = ifa->ifa_addr->sa_family;
+
+		/* Display interface name and family (including symbolic
+		form of the latter for the common families) */
+		 
+		printf("%-8s %s (%d)\n",
+		      ifa->ifa_name,
+		      (family == AF_PACKET) ? "AF_PACKET" :
+		      (family == AF_INET) ? "AF_INET" :
+		      (family == AF_INET6) ? "AF_INET6" : "???",
+		      family);
+
+	   /* For an AF_INET* interface address, display the address */
+
+	   if (family == AF_INET || family == AF_INET6) {
+	       s = getnameinfo(ifa->ifa_addr,
+	               (family == AF_INET) ? sizeof(struct sockaddr_in) :
+	                                     sizeof(struct sockaddr_in6),
+	               host, NI_MAXHOST,
+	               NULL, 0, NI_NUMERICHOST);
+	       if (s != 0) {
+	           printf("getnameinfo() failed: %s\n", gai_strerror(s));
+	           exit(EXIT_FAILURE);
+	       }
+
+	       printf("\t\taddress: <%s>\n", host);
+
+	   } else if (family == AF_PACKET && ifa->ifa_data != NULL) {
+	       struct rtnl_link_stats *stats = (struct rtnl_link_stats *)ifa->ifa_data;
+
+	       printf("\t\ttx_packets = %10u; rx_packets = %10u\n"
+	              "\t\ttx_bytes   = %10u; rx_bytes   = %10u\n",
+	              stats->tx_packets, stats->rx_packets,
+	              stats->tx_bytes, stats->rx_bytes);
+	   }
+	}
+
+	freeifaddrs(ifaddr);
+	return 0;
+}
+
+// return: 0: network interface get succeed
+int get_net_ifname(char *if_buf, int blen)
+{
+	if (NULL == if_buf || blen < 8) return -1;
+
+	struct ifaddrs *ifaddr, *ifa;
+	int family, n;
+	int ret = 1;
+	if (getifaddrs(&ifaddr) == -1) {
+	   perror("getifaddrs");
+	   exit(EXIT_FAILURE);
+	}
+
+	int found = 0;
+	char tmp_if_buf[16];
+	memset(tmp_if_buf, 0, sizeof(tmp_if_buf));
+	/* Walk through linked list, maintaining head pointer so we
+	  can free list later */
+	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
+	    if (ifa->ifa_addr == NULL) continue;
+
+	    family = ifa->ifa_addr->sa_family;
+
+		if (family == AF_INET) {
+			// for LEDE/OpenWRT embedded router os
+			if (strcmp(ifa->ifa_name, "br-lan") == 0) {
+				found = 1;
+				break;
+			}
+		} else if (family == AF_PACKET && 
+			ifa->ifa_data != NULL && 
+			strcmp(ifa->ifa_name, "lo") != 0) { // skip local loop interface
+			
+			strncpy(tmp_if_buf, ifa->ifa_name, 16);
+		}
+	}
+
+	if (found) {
+		strncpy(if_buf, ifa->ifa_name, blen);
+		ret = 0;
+	} else if (tmp_if_buf[0] != 0) {
+		strncpy(if_buf, tmp_if_buf, blen);
+		ret = 0;
+	}
+
+	freeifaddrs(ifaddr);
+	return ret;
 }

utils.h

@@ -6,5 +6,8 @@ void s_sleep(unsigned int s, unsigned int u);
 // is_valid_ip_address:
 // return 0:ipaddress unlegal
 int is_valid_ip_address(const char *ip_address);
+int show_net_ifname();
+int get_net_ifname(char *if_buf, int blen);
+int get_net_mac(char *net_if_name, char *mac, int mac_len);
 
 #endif //_UTILS_H_

version.h

@@ -1,7 +1,7 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define VERSION   "0.05."
+#define VERSION   "1.0.1"
 #define PROTOCOL_VERESION "0.10.0"
 #define CLIENT_V 1