From: fendo <fendo@bi12info.com>
Date: Tue, 21 May 2013 09:54:43 +0000 (+0200)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.9~7
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/59e6083b5ecbb2a8e9ab511ac2f8da40b5c82f66?ds=sidebyside;hp=--cc

Merge from master
---

59e6083b5ecbb2a8e9ab511ac2f8da40b5c82f66
diff --cc l2tpns.c
index b55ea53,68817a2..537ea34
--- a/l2tpns.c
+++ b/l2tpns.c
@@@ -183,8 -186,8 +183,9 @@@ config_descriptt config_values[] = 
  	CONFIG("disable_sending_hello", disable_sending_hello, BOOL),
  	CONFIG("disable_no_spoof", disable_no_spoof, BOOL),
  	CONFIG("bind_multi_address", bind_multi_address, STRING),
 +	CONFIG("grp_txrate_average_time", grp_txrate_average_time, INT),
  	CONFIG("pppoe_only_equal_svc_name", pppoe_only_equal_svc_name, BOOL),
+ 	CONFIG("multi_hostname", multi_hostname, STRING),
  	{ NULL, 0, 0, 0 }
  };
  
diff --cc l2tpns.h
index ee355b0,1d6055d..1ce46a3
--- a/l2tpns.h
+++ b/l2tpns.h
@@@ -822,6 -782,7 +824,8 @@@ typedef struc
  	int nbudpfd; // number UDP file handle
  	int nbmultiaddress; // number multi address to bind
  	int indexlacudpfd;	// Index UDP LAC file handle (in udpfd[])
+ 	int nbmultihostname;	// number hostname, normally the same number as the nbudpfd
++	int grp_txrate_average_time; // caculation txrate average time (default 10s)
  	in_addr_t bind_n_address[MAX_BINDADDR];
  	in_addr_t iftun_n_address[MAX_BINDADDR];
  	char bind_multi_address[256];