diff --git a/src/ac/conf.c b/src/ac/conf.c
index a7df25b6..95b39ac5 100644
--- a/src/ac/conf.c
+++ b/src/ac/conf.c
@@ -31,64 +31,66 @@
 #include "capwap/cw_util.h"
 #include "capwap/action.h"
 
+#include "ac.h"
+
 uint8_t conf_macaddress[12];
-uint8_t conf_macaddress_len=0;
+uint8_t conf_macaddress_len = 0;
 
 
-long conf_strict_capwap=1;
-long conf_strict_headers=0;
-char * conf_capwap_mode_str=NULL;
-int conf_capwap_mode=CW_MODE_CAPWAP;
+long conf_strict_capwap = 1;
+long conf_strict_headers = 0;
+char *conf_capwap_mode_str = NULL;
+int conf_capwap_mode = CW_MODE_CAPWAP;
 
 
 
-const char * conf_acname = NULL; 
+const char *conf_acname = NULL;
 int conf_acname_len = 0;
 
-char * conf_acid = NULL;
+char *conf_acid = NULL;
 
-char * conf_primary_if = NULL;
+char *conf_primary_if = NULL;
 
 long conf_max_wtps = CONF_DEFAULT_MAXWTPS;
-char * conf_logfilename=CONF_DEFAULT_LOGFILENAME;
-struct sockaddr_storage * conf_salist=NULL;
+char *conf_logfilename = CONF_DEFAULT_LOGFILENAME;
+struct sockaddr_storage *conf_salist = NULL;
 
-char ** conf_listen_addrs;
-int conf_listen_addrs_len=0;
+char **conf_listen_addrs;
+int conf_listen_addrs_len = 0;
 
 
-char ** conf_mcast_groups=0;
-int conf_mcast_groups_len=0;
+char **conf_mcast_groups = 0;
+int conf_mcast_groups_len = 0;
 
-char ** conf_bcast_addrs=0;
+char **conf_bcast_addrs = 0;
 int conf_bcast_addrs_len;
 
 
-struct sockaddr_storage * conf_bsalist=NULL;
+struct sockaddr_storage *conf_bsalist = NULL;
 
-int conf_salist_len=0;
-int conf_bsalist_len=0;
+int conf_salist_len = 0;
+int conf_bsalist_len = 0;
 
-struct sockaddr * conf_ac_ips;
+struct sockaddr *conf_ac_ips;
 int conf_ac_ips_len;
 
-char * conf_sslcertfilename=NULL;
-char * conf_sslkeyfilename=NULL;
-char * conf_sslkeypass=NULL;
-char * conf_sslcipher=NULL;
-char * conf_dtls_psk=NULL;
+char *conf_sslcertfilename = NULL;
+char *conf_sslkeyfilename = NULL;
+char *conf_sslkeypass = NULL;
+char *conf_sslcipher = NULL;
+char *conf_dtls_psk = NULL;
 
 //char * conf_ac_hardware_version=NULL;
 //char * conf_ac_software_version=NULL;
-int conf_security=0;
-long conf_vendor_id=CONF_DEFAULT_VENDOR_ID;
+int conf_security = 0;
+long conf_vendor_id = CONF_DEFAULT_VENDOR_ID;
 
 
-bstr_t conf_hardware_version=NULL;
-bstr_t conf_software_version=NULL;
+bstr_t conf_hardware_version = NULL;
+bstr_t conf_software_version = NULL;
 
-bstr_t conf_cisco_hardware_version=NULL;
-bstr_t conf_cisco_software_version=NULL;
+bstr_t conf_cisco_hardware_version = NULL;
+bstr_t conf_cisco_software_version = NULL;
 
 
 //int conf_hardware_version_len=0;
@@ -98,37 +100,37 @@ bstr_t conf_cisco_software_version=NULL;
 
 int conf_use_loopback = 0;
 
-long conf_debug_level=-1;
+long conf_debug_level = -1;
 
-char * conf_db_file =0;
+char *conf_db_file = 0;
 
-int conf_ipv4=1;
+int conf_ipv4 = 1;
 #ifdef WITH_IPV6
-int conf_ipv6=1;
+int conf_ipv6 = 1;
 #endif
 
 
 #ifdef WITH_LWAPP
-int conf_lwapp=1;
-char * conf_lw_control_port=0;
-#endif 
+int conf_lwapp = 1;
+char *conf_lw_control_port = 0;
+#endif
 
-char * conf_image_dir=0;
+char *conf_image_dir = 0;
 
 
-char * conf_control_port=0;
+char *conf_control_port = 0;
 
 
-int conf_dtls_verify_peer=1;
+int conf_dtls_verify_peer = 1;
 
 static int init_acname()
 {
-	if (conf_acname == NULL){
-		char *s=malloc(strlen(CONF_DEFAULT_ACNAME)+strlen(conf_acid)+1);
-		sprintf(s,"%s%s",CONF_DEFAULT_ACNAME,conf_acid);
-		conf_acname=s;
+	if (conf_acname == NULL) {
+		char *s = malloc(strlen(CONF_DEFAULT_ACNAME) + strlen(conf_acid) + 1);
+		sprintf(s, "%s%s", CONF_DEFAULT_ACNAME, conf_acid);
+		conf_acname = s;
 	}
-	conf_acname_len=strlen(conf_acname);
+	conf_acname_len = strlen(conf_acname);
 	return 1;
 }
 
@@ -140,31 +142,33 @@ static int init_acid()
 
 
 #ifdef WITH_IPV6
-	conf_primary_if  = sock_get_primary_if(AF_INET6);
+	conf_primary_if = sock_get_primary_if(AF_INET6);
 	if (!conf_primary_if)
 		conf_primary_if = sock_get_primary_if(AF_INET);
-#else	
+#else
 	conf_primary_if = get_primary_if(AF_INET);
 #endif
 
-	if (!conf_primary_if){
-		cw_log(LOG_ERR,"Fatal: Unable to detect primary interface, needed to set ac_id. Pleas use confiPleas u to set ac_id");
+	if (!conf_primary_if) {
+		cw_log(LOG_ERR,
+		       "Fatal: Unable to detect primary interface, needed to set ac_id. Pleas use confiPleas u to set ac_id");
 		return 0;
-	}		
+	}
 
-	if (!sock_getifhwaddr(conf_primary_if,conf_macaddress,&conf_macaddress_len)){
-		cw_log(LOG_ERR,"Fatal: Unable to detect link layer address for %s\n",conf_primary_if);
+	if (!sock_getifhwaddr(conf_primary_if, conf_macaddress, &conf_macaddress_len)) {
+		cw_log(LOG_ERR, "Fatal: Unable to detect link layer address for %s\n",
+		       conf_primary_if);
 		return 0;
 	};
 
 	int i;
 
 
-	conf_acid = malloc(2*conf_macaddress_len+1);
+	conf_acid = malloc(2 * conf_macaddress_len + 1);
 	char *s = conf_acid;
 
-	for (i=0; i<conf_macaddress_len; i++){
-		s+=sprintf(s,"%02X",conf_macaddress[i]);
+	for (i = 0; i < conf_macaddress_len; i++) {
+		s += sprintf(s, "%02X", conf_macaddress[i]);
 	}
 	return 1;
 
@@ -172,12 +176,12 @@ static int init_acid()
 
 static int init_dtls()
 {
-	if (conf_dtls_psk!=NULL){
-//		conf_security=CW_SECURITY_FLAGS_S;
+	if (conf_dtls_psk != NULL) {
+//              conf_security=CW_SECURITY_FLAGS_S;
 	}
 
-	return 1;	
-}	
+	return 1;
+}
 
 
 static int init_vendor_id()
@@ -255,31 +259,35 @@ static int init_version()
 {
 
 	/* Init hardware version */
-	if (!conf_hardware_version)
-	{
+	if (!conf_hardware_version) {
 		struct utsname u;
 		int rc = uname(&u);
-		if (rc<0)
-			conf_hardware_version=(bstr_t)strdup(CONF_DEFAULT_HARDWARE_VERSION);
-		else{
+		if (rc < 0)
+			conf_hardware_version =
+			    (bstr_t) strdup(CONF_DEFAULT_HARDWARE_VERSION);
+		else {
 			char str[265];
-			sprintf(str,"%s / %s %s",u.machine,u.sysname,u.release);
-			conf_hardware_version=(bstr_t)strdup(str);
+			sprintf(str, "%s / %s %s", u.machine, u.sysname, u.release);
+			conf_hardware_version = (bstr_t) strdup(str);
 		}
 
 	}
-	bstr_replace(&conf_hardware_version,bstr_create_from_cfgstr((char*)conf_hardware_version));
+	bstr_replace(&conf_hardware_version,
+		     bstr_create_from_cfgstr((char *) conf_hardware_version));
 
 	/* software version */
 	if (!conf_software_version)
-		conf_software_version=(bstr_t)strdup(CONF_DEFAULT_SOFTWARE_VERSION);
-	bstr_replace(&conf_software_version,bstr_create_from_cfgstr((char*)conf_software_version));
+		conf_software_version = (bstr_t) strdup(CONF_DEFAULT_SOFTWARE_VERSION);
+	bstr_replace(&conf_software_version,
+		     bstr_create_from_cfgstr((char *) conf_software_version));
 
 
 	/* Cisco hardware version */
 	if (!conf_cisco_hardware_version)
-		conf_cisco_hardware_version=(bstr_t)strdup(CONF_DEFAULT_CISCO_HARDWARE_VERSION);
-	bstr_replace(&conf_cisco_hardware_version,bstr_create_from_cfgstr((char*)conf_cisco_hardware_version));
+		conf_cisco_hardware_version =
+		    (bstr_t) strdup(CONF_DEFAULT_CISCO_HARDWARE_VERSION);
+	bstr_replace(&conf_cisco_hardware_version,
+		     bstr_create_from_cfgstr((char *) conf_cisco_hardware_version));
 
 	/* Cisco software version */
 /*
@@ -289,21 +297,23 @@ static int init_version()
 */
 
 
-	
+
 	return 1;
 }
 
 static int init_control_port()
 {
 	char str[30];
-	sprintf(str,"%d",CONF_DEFAULT_CONTROL_PORT);
-	conf_control_port=(char*)cw_setstr((uint8_t**)&conf_control_port,(uint8_t*)str,strlen(str));
+	sprintf(str, "%d", CONF_DEFAULT_CONTROL_PORT);
+	conf_control_port =
+	    (char *) cw_setstr((uint8_t **) & conf_control_port, (uint8_t *) str,
+			       strlen(str));
 
 
 #ifdef WITH_LWAPP
-	sprintf(str,"%d",CONF_DEFAULT_LW_CONTROL_PORT);
+	sprintf(str, "%d", CONF_DEFAULT_LW_CONTROL_PORT);
 	conf_lw_control_port = strdup(str);
-#endif 
+#endif
 
 	return 1;
 }
@@ -312,91 +322,94 @@ static int init_control_port()
 
 static int init_listen_addrs()
 {
-	if (conf_listen_addrs!=0)
+	if (conf_listen_addrs != 0)
 		return 1;
 
-	struct ifaddrs * ifap,*ifa;
+	struct ifaddrs *ifap, *ifa;
 
 	int rc = getifaddrs(&ifap);
-	if (rc==-1)
+	if (rc == -1)
 		return 0;
 
 	/* count the addresses */
-	int ctr=0;
-	for (ifa=ifap; ifa!=0; ifa=ifa->ifa_next){
-		if (ifa->ifa_addr->sa_family==AF_INET && conf_ipv4)
+	int ctr = 0;
+	for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) {
+		if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4)
 			ctr++;
 #ifdef WITH_IPV6
-		if (ifa->ifa_addr->sa_family==AF_INET6 && conf_ipv6)
+		if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6)
 			ctr++;
-#endif		
+#endif
 	}
 
-	conf_listen_addrs = malloc(sizeof(char*)*ctr);
-	if (!conf_listen_addrs){
-		rc=0;
+	conf_listen_addrs = malloc(sizeof(char *) * ctr);
+	if (!conf_listen_addrs) {
+		rc = 0;
 		goto errX;
 	}
-	memset(conf_listen_addrs,0,sizeof(char*)*ctr);
+	memset(conf_listen_addrs, 0, sizeof(char *) * ctr);
 
 
-	ctr=0;
+	ctr = 0;
 	/* get the addresses */
-	for (ifa=ifap; ifa!=0; ifa=ifa->ifa_next){
+	for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) {
 		char str[100];
 
 		/** ignore loopback interfaces if configured*/
-		if(!conf_use_loopback){
-			if ((ifa->ifa_flags & IFF_LOOPBACK)){
+		if (!conf_use_loopback) {
+			if ((ifa->ifa_flags & IFF_LOOPBACK)) {
 				continue;
 			}
-
 		}
 
-		if (ifa->ifa_addr->sa_family==AF_INET && conf_ipv4){
-			sock_addrtostr(ifa->ifa_addr,str,100);
-			*strchr(str,':')=0;
-			conf_listen_addrs[ctr]=(char*)cw_setstr((uint8_t**)&conf_listen_addrs[ctr],(uint8_t*)str,strlen(str));
+		if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4) {
+			sock_addrtostr(ifa->ifa_addr, str, 100);
+			*strchr(str, ':') = 0;
+			conf_listen_addrs[ctr] =
+			    (char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
+					       (uint8_t *) str, strlen(str));
 			if (conf_listen_addrs[ctr])
 				ctr++;
 
 		}
 #ifdef WITH_IPV6
-		if (ifa->ifa_addr->sa_family==AF_INET6 && conf_ipv6){
-			sock_addrtostr(ifa->ifa_addr,str,100);
-			if (strncmp(str,"fe80:",5)==0){
-				strcat(str,"%");
-				strcat(str,ifa->ifa_name);
+		if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6) {
+			sock_addrtostr(ifa->ifa_addr, str, 100);
+			if (strncmp(str, "fe80:", 5) == 0) {
+				strcat(str, "%");
+				strcat(str, ifa->ifa_name);
 			}
-			conf_listen_addrs[ctr]=(char*)cw_setstr((uint8_t**)&conf_listen_addrs[ctr],(uint8_t*)str,strlen(str));
+			conf_listen_addrs[ctr] =
+			    (char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
+					       (uint8_t *) str, strlen(str));
 			if (conf_listen_addrs[ctr])
 				ctr++;
 		}
-#endif		
+#endif
 	}
-	conf_listen_addrs_len=ctr;
-	rc=1;
-errX:
+	conf_listen_addrs_len = ctr;
+	rc = 1;
+      errX:
 	freeifaddrs(ifap);
 	return rc;
 }
 
 
-static char * conf_default_mcast_groups_ipv4[] = {
+static char *conf_default_mcast_groups_ipv4[] = {
 	"224.0.1.140",
 };
 
 
 
 #ifdef WITH_IPV6
-static char * conf_default_mcast_groups_ipv6[] = {
+static char *conf_default_mcast_groups_ipv6[] = {
 /*	"ff01:0:0:0:0:0:0:18c",
 	"ff02:0:0:0:0:0:0:18c%em0",
 	"ff03:0:0:0:0:0:0:18c",
 	"ff04:0:0:0:0:0:0:18c",
 	"ff05:0:0:0:0:0:0:18c",
 	"ff06:0:0:0:0:0:0:18c"
-*/	
+*/
 };
 #endif
 
@@ -405,11 +418,11 @@ static char * conf_default_mcast_groups_ipv6[] = {
 
 
 
-static int add_bcast_addr(void *priv, void * addr)
+static int add_bcast_addr(void *priv, void *addr)
 {
-	char *s = (char*)addr;
-	conf_bcast_addrs[conf_bcast_addrs_len]=strdup(s);
-	if (conf_bcast_addrs[conf_bcast_addrs_len]!=0)
+	char *s = (char *) addr;
+	conf_bcast_addrs[conf_bcast_addrs_len] = strdup(s);
+	if (conf_bcast_addrs[conf_bcast_addrs_len] != 0)
 		conf_bcast_addrs_len++;
 	return 1;
 }
@@ -430,43 +443,43 @@ int init_bcast_addrs()
 		return 0;
 
 	/* add the default broadast address */
-	stravltree_add(t,"255.255.255.255");
+	stravltree_add(t, "255.255.255.255");
 
 
 	/* add all other local broadcast addresses */
-	struct ifaddrs * ifa0,*ifa;
+	struct ifaddrs *ifa0, *ifa;
 	int rc = getifaddrs(&ifa0);
-	if (rc==-1)
+	if (rc == -1)
 		return 0;
 
-	for (ifa=ifa0; ifa!=0; ifa=ifa->ifa_next){
-		struct sockaddr * sa;
+	for (ifa = ifa0; ifa != 0; ifa = ifa->ifa_next) {
+		struct sockaddr *sa;
 		if (!(ifa->ifa_flags & IFF_BROADCAST))
 			continue;
 
-		
-		if(!conf_use_loopback){
+
+		if (!conf_use_loopback) {
 			if ((ifa->ifa_flags & IFF_LOOPBACK))
 				continue;
 		}
 
 
 		sa = ifa->ifa_addr;
-		if(sa->sa_family != AF_INET)
+		if (sa->sa_family != AF_INET)
 			continue;
 
 		char str[100];
-		if (ifa->ifa_broadaddr){
-			sock_addrtostr(ifa->ifa_broadaddr,str,100);
-			*strchr(str,':')=0;
-			stravltree_add(t,str);
+		if (ifa->ifa_broadaddr) {
+			sock_addrtostr(ifa->ifa_broadaddr, str, 100);
+			*strchr(str, ':') = 0;
+			stravltree_add(t, str);
 		}
 
 	}
 
-	conf_bcast_addrs=malloc(t->count*sizeof(char*));
+	conf_bcast_addrs = malloc(t->count * sizeof(char *));
 
-	stravltree_foreach_asc(t,add_bcast_addr,0);
+	stravltree_foreach_asc(t, add_bcast_addr, 0);
 	stravltree_destroy(t);
 
 	freeifaddrs(ifa0);
@@ -480,68 +493,71 @@ int init_mcast_groups()
 		return 1;
 
 	int n = 0;
-	int n4=0,n6=0;
-	if (conf_ipv4){
-		n4=sizeof(conf_default_mcast_groups_ipv4)/sizeof(char*);
+	int n4 = 0, n6 = 0;
+	if (conf_ipv4) {
+		n4 = sizeof(conf_default_mcast_groups_ipv4) / sizeof(char *);
 	}
-
 #ifdef WITH_IPV6
-	if (conf_ipv6){
-		n6=sizeof(conf_default_mcast_groups_ipv6)/sizeof(char*);
+	if (conf_ipv6) {
+		n6 = sizeof(conf_default_mcast_groups_ipv6) / sizeof(char *);
 	}
-#endif	
-	n=n4+n6;
-	if (n==0)
+#endif
+	n = n4 + n6;
+	if (n == 0)
 		return 1;
 
-	conf_mcast_groups=malloc(sizeof(char*)*n);
+	conf_mcast_groups = malloc(sizeof(char *) * n);
 	if (!conf_mcast_groups)
 		return 0;
-	memset(conf_mcast_groups,0,n*sizeof(char*));
+	memset(conf_mcast_groups, 0, n * sizeof(char *));
 
-	int ctr=0;
+	int ctr = 0;
 	int i;
-	for(i=0; i<n4; i++){
-		uint8_t *g = (uint8_t*)conf_default_mcast_groups_ipv4[i];
-		conf_mcast_groups[ctr]=(char*)cw_setstr((uint8_t**)&conf_mcast_groups[ctr],g,strlen((char*)g));
+	for (i = 0; i < n4; i++) {
+		uint8_t *g = (uint8_t *) conf_default_mcast_groups_ipv4[i];
+		conf_mcast_groups[ctr] =
+		    (char *) cw_setstr((uint8_t **) & conf_mcast_groups[ctr], g,
+				       strlen((char *) g));
 		if (conf_mcast_groups[ctr])
 			ctr++;
 	}
 
-	for(i=0; i<n6; i++){
-		uint8_t *g = (uint8_t*)conf_default_mcast_groups_ipv6[i];
-		conf_mcast_groups[ctr]=(char*)cw_setstr((uint8_t**)&conf_mcast_groups[ctr],g,strlen((char*)g));
+	for (i = 0; i < n6; i++) {
+		uint8_t *g = (uint8_t *) conf_default_mcast_groups_ipv6[i];
+		conf_mcast_groups[ctr] =
+		    (char *) cw_setstr((uint8_t **) & conf_mcast_groups[ctr], g,
+				       strlen((char *) g));
 		if (conf_mcast_groups[ctr])
 			ctr++;
 	}
 
 
-	conf_mcast_groups_len=n;
+	conf_mcast_groups_len = n;
 	return 1;
 
 }
 
-static int conf_read_strings( cfg_t * cfg, char * name, char ***dst,int *len)
+static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
 {
 
-	int n,i;
+	int n, i;
 	n = cfg_size(cfg, name);
-	*len=n;
-	if (n==0)
+	*len = n;
+	if (n == 0)
 		return 1;
 
-	*dst = malloc(sizeof(char*)*n);
+	*dst = malloc(sizeof(char *) * n);
 	if (!*dst)
 		return 0;
 
-	for (i=0; i<n; i++) {
-		char * str = cfg_getnstr(cfg,name,i);
-		if (!((*dst)[i]=malloc(strlen(str)+1))) {
-			*len=0;
+	for (i = 0; i < n; i++) {
+		char *str = cfg_getnstr(cfg, name, i);
+		if (!((*dst)[i] = malloc(strlen(str) + 1))) {
+			*len = 0;
 			return 0;
 		}
 
-		strcpy((*dst)[i],str);
+		strcpy((*dst)[i], str);
 	}
 	return 1;
 }
@@ -556,19 +572,19 @@ struct conf_dbg_level_names{
 */
 
 
-static int conf_read_dbg_level(cfg_t *cfg)
+static int conf_read_dbg_level(cfg_t * cfg)
 {
-	const char * name = "dbg";
-	int n,i;
+	const char *name = "dbg";
+	int n, i;
 	n = cfg_size(cfg, name);
 
 
-	for (i=0; i<n; i++) {
-		char * str = cfg_getnstr(cfg,name,i);
+	for (i = 0; i < n; i++) {
+		char *str = cfg_getnstr(cfg, name, i);
 //int u = cw_log_str2dbglevel(str);
-		int b = cw_strlist_get_id(cw_dbg_strings,str); //cw_log_str2dbglevel(str);
+		int b = cw_strlist_get_id(cw_dbg_strings, str);	//cw_log_str2dbglevel(str);
 
-		cw_dbg_set_level(b,1);
+		cw_dbg_set_level(b, 1);
 
 	}
 	return 1;
@@ -576,23 +592,104 @@ static int conf_read_dbg_level(cfg_t *cfg)
 
 void conf_init_capwap_mode()
 {
-	if ( conf_capwap_mode_str==NULL)
+	if (conf_capwap_mode_str == NULL)
 		return;
 
-	if ( 0==strcmp(conf_capwap_mode_str,"cipwap")){
-		conf_capwap_mode=CW_MODE_CIPWAP;
+	if (0 == strcmp(conf_capwap_mode_str, "cipwap")) {
+		conf_capwap_mode = CW_MODE_CIPWAP;
 	}
 
-	if ( 0==strcmp(conf_capwap_mode_str,"capwap")){
-		conf_capwap_mode=CW_MODE_CAPWAP;
+	if (0 == strcmp(conf_capwap_mode_str, "capwap")) {
+		conf_capwap_mode = CW_MODE_CAPWAP;
 	}
 
-	
+
 }
 
 
-int read_config(const char * filename){
-	int i,n;
+
+int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *proto)
+{
+	char *p = strchr(addrstr, '/');
+	if (!p)
+		*proto = AC_PROTO_CAPWAP;
+	else {
+		if (strcmp("capwap", p + 1) == 0)
+			*proto = AC_PROTO_CAPWAP;
+		else if (strcmp("lwapp", p + 1) == 0)
+			*proto = AC_PROTO_LWAPP;
+		else
+			*proto = AC_PROTO_UNKNOWN;
+	}
+
+	char *ctrlport;
+	switch (*proto) {
+		case AC_PROTO_CAPWAP:
+			ctrlport = CAPWAP_CONTROL_PORT_STR;
+			break;
+		case AC_PROTO_LWAPP:
+			ctrlport = LWAPP_CONTROL_PORT_STR;
+			break;
+		default:
+			ctrlport = "0";
+	}
+
+
+	int i, l;
+	int c = 0;
+
+	if (p)
+		l = p - addrstr;
+	else
+		l = strlen(addrstr);
+
+	for (i = 0; i < l; i++) {
+		if (addrstr[i] == ':')
+			c++;
+	}
+
+	/* no colon found, asume its ipv4 w/o port */
+	if (c == 0) {
+		strncpy(saddr, addrstr, l);
+		saddr[l] = 0;
+		strcpy(port, ctrlport);
+		return 0;
+	}
+
+	/* one colon found, so we assume, its an ipv4 
+	 * address with port */
+	if (c == 1) {
+		char *c = strchr(addrstr, ':');
+		strncpy(saddr, addrstr, c - addrstr);
+		saddr[c - addrstr] = 0;
+		strncpy(port, c + 1, l - (c - addrstr));
+		port[l - (c - addrstr) - 1] = 0;
+		return 0;
+	}
+
+	/* we assume now, its ipv6 */
+	char *b = strstr(addrstr, "]:");
+	if (!b) {
+		/* ippv6 w/o port */
+		strncpy(saddr, addrstr, l);
+		saddr[l] = 0;
+		strcpy(port, ctrlport);
+		return 0;
+	}
+
+	strncpy(saddr, addrstr + 1, b - addrstr);
+	saddr[b - addrstr - 1] = 0;
+	strncpy(port, b + 2, l - (b - addrstr) - 2);
+	port[l - (b - addrstr) - 2] = 0;
+	return 0;
+}
+
+
+
+
+int read_config(const char *filename)
+{
+	int i, n;
 
 	if (!init_control_port())
 		return 0;
@@ -608,45 +705,45 @@ int read_config(const char * filename){
 		CFG_STR_LIST("listen", "{}", CFGF_NONE),
 		CFG_STR_LIST("mcast_groups", "{}", CFGF_NONE),
 		CFG_STR_LIST("bcast_addrs", "{}", CFGF_NONE),
-		CFG_STR_LIST("ac_ips","{}",CFGF_NONE),
-		CFG_SIMPLE_STR("control_port",&conf_control_port),
+		CFG_STR_LIST("ac_ips", "{}", CFGF_NONE),
+		CFG_SIMPLE_STR("control_port", &conf_control_port),
+
+		CFG_SIMPLE_BOOL("strict_capwap", &conf_strict_capwap),
+		CFG_SIMPLE_BOOL("strict_headers", &conf_strict_headers),
+		CFG_SIMPLE_STR("capwap_mode", &conf_capwap_mode_str),
 
-		CFG_SIMPLE_BOOL("strict_capwap",&conf_strict_capwap),
-		CFG_SIMPLE_BOOL("strict_headers",&conf_strict_headers),
-		CFG_SIMPLE_STR("capwap_mode",&conf_capwap_mode_str),
 
-	
 #ifdef WITH_LWAPP
-		CFG_SIMPLE_STR("lw_control_port",&conf_lw_control_port),
-		CFG_SIMPLE_BOOL("lwapp",&conf_lwapp),
+		CFG_SIMPLE_STR("lw_control_port", &conf_lw_control_port),
+		CFG_SIMPLE_BOOL("lwapp", &conf_lwapp),
 #endif
 
-		CFG_SIMPLE_INT("max_wtps",&conf_max_wtps),
-		CFG_SIMPLE_INT("debug_level",&conf_debug_level),
+		CFG_SIMPLE_INT("max_wtps", &conf_max_wtps),
+		CFG_SIMPLE_INT("debug_level", &conf_debug_level),
 
 
-		CFG_SIMPLE_INT("vendor_id",&conf_vendor_id),
-		CFG_SIMPLE_STR("ac_id",&conf_acid),
-		CFG_SIMPLE_STR("ac_name",&conf_acname),
-		CFG_SIMPLE_STR("hardware_version",&conf_hardware_version),
-		CFG_SIMPLE_STR("software_version",&conf_software_version),
-		
-		CFG_SIMPLE_STR("cisco_hardware_version",&conf_cisco_hardware_version),
-		CFG_SIMPLE_STR("cisco_software_version",&conf_cisco_software_version),
+		CFG_SIMPLE_INT("vendor_id", &conf_vendor_id),
+		CFG_SIMPLE_STR("ac_id", &conf_acid),
+		CFG_SIMPLE_STR("ac_name", &conf_acname),
+		CFG_SIMPLE_STR("hardware_version", &conf_hardware_version),
+		CFG_SIMPLE_STR("software_version", &conf_software_version),
+
+		CFG_SIMPLE_STR("cisco_hardware_version", &conf_cisco_hardware_version),
+		CFG_SIMPLE_STR("cisco_software_version", &conf_cisco_software_version),
 
 
 
-		CFG_SIMPLE_STR("ssl_cert",&conf_sslcertfilename),
-		CFG_SIMPLE_STR("ssl_key",&conf_sslkeyfilename),
-		CFG_SIMPLE_STR("ssl_key_pass",&conf_sslkeypass),
-		CFG_SIMPLE_STR("ssl_cipher",&conf_sslcipher),
-		CFG_SIMPLE_STR("dtls_psk",&conf_dtls_psk),
-		
-		CFG_SIMPLE_BOOL("dtls_verify_peer",&conf_dtls_verify_peer),
-		CFG_SIMPLE_BOOL("ipv4",&conf_ipv4),
-		CFG_SIMPLE_BOOL("ipv6",&conf_ipv6),
-		CFG_SIMPLE_STR("db_file",conf_db_file),
-		CFG_SIMPLE_STR("image_dir",&conf_image_dir),
+		CFG_SIMPLE_STR("ssl_cert", &conf_sslcertfilename),
+		CFG_SIMPLE_STR("ssl_key", &conf_sslkeyfilename),
+		CFG_SIMPLE_STR("ssl_key_pass", &conf_sslkeypass),
+		CFG_SIMPLE_STR("ssl_cipher", &conf_sslcipher),
+		CFG_SIMPLE_STR("dtls_psk", &conf_dtls_psk),
+
+		CFG_SIMPLE_BOOL("dtls_verify_peer", &conf_dtls_verify_peer),
+		CFG_SIMPLE_BOOL("ipv4", &conf_ipv4),
+		CFG_SIMPLE_BOOL("ipv6", &conf_ipv6),
+		CFG_SIMPLE_STR("db_file", conf_db_file),
+		CFG_SIMPLE_STR("image_dir", &conf_image_dir),
 
 		CFG_END()
 	};
@@ -654,18 +751,19 @@ int read_config(const char * filename){
 	cfg = cfg_init(opts, 0);
 
 	cfg_parse(cfg, filename);
-	
+
 	/* read debug options */
 	conf_read_dbg_level(cfg);
 
 	/* read the listen addresses */
-	conf_read_strings(cfg,"listen",&conf_listen_addrs,&conf_listen_addrs_len);
+	conf_read_strings(cfg, "listen", &conf_listen_addrs, &conf_listen_addrs_len);
 
 	/* read multi cast groups */
-	conf_read_strings(cfg,"mcast_groups",&conf_mcast_groups,&conf_mcast_groups_len);
+	conf_read_strings(cfg, "mcast_groups", &conf_mcast_groups,
+			  &conf_mcast_groups_len);
 
 	/* read ipv4 broadcast addresses */
-	conf_read_strings(cfg,"bcast_addrs",&conf_bcast_addrs,&conf_bcast_addrs_len);
+	conf_read_strings(cfg, "bcast_addrs", &conf_bcast_addrs, &conf_bcast_addrs_len);
 
 
 
@@ -674,16 +772,16 @@ int read_config(const char * filename){
 
 	/* read ac_ips */
 	n = cfg_size(cfg, "ac_ips");
-	if (! (conf_ac_ips = malloc(sizeof (struct sockaddr)*n)) )
+	if (!(conf_ac_ips = malloc(sizeof(struct sockaddr) * n)))
 		return 0;
 
-	conf_ac_ips_len=n;
-	for (i=0; i<n; i++) {
+	conf_ac_ips_len = n;
+	for (i = 0; i < n; i++) {
 		struct sockaddr sa;
-		char * str = cfg_getnstr(cfg,"ac_ips",i);
-		if (sock_strtoaddr ( cfg_getnstr(cfg, "ac_ips", i),&sa))
-			conf_ac_ips[i]=sa;
-		else{
+		char *str = cfg_getnstr(cfg, "ac_ips", i);
+		if (sock_strtoaddr(cfg_getnstr(cfg, "ac_ips", i), &sa))
+			conf_ac_ips[i] = sa;
+		else {
 			perror(str);
 		}
 	}
@@ -694,7 +792,7 @@ int read_config(const char * filename){
 	if (!init_acid())
 		return 0;
 
-	if (!init_acname() )
+	if (!init_acname())
 		return 0;
 
 	if (!init_version())
@@ -708,10 +806,10 @@ int read_config(const char * filename){
 		return 0;
 
 	if (!conf_sslcipher)
-		conf_sslcipher=CAPWAP_CIPHER;
+		conf_sslcipher = CAPWAP_CIPHER;
 
 	if (!conf_image_dir)
-		conf_image_dir=CONF_DEFAULT_IMAGE_DIR;
+		conf_image_dir = CONF_DEFAULT_IMAGE_DIR;
 
 	conf_init_capwap_mode();
 
@@ -728,5 +826,3 @@ void free_config()
 {
 
 }
-
-
diff --git a/src/ac/conf.h b/src/ac/conf.h
index bf9592bb..b98917b4 100644
--- a/src/ac/conf.h
+++ b/src/ac/conf.h
@@ -31,31 +31,31 @@
 #include "capwap/bstr.h"
 
 #ifndef CONF_DEFAULT_ACNAME
-	#define CONF_DEFAULT_ACNAME "AC"
+#define CONF_DEFAULT_ACNAME "AC"
 #endif
 
-#ifndef CONF_DEFAULT_MAXWTPS 
-	#define CONF_DEFAULT_MAXWTPS 200
+#ifndef CONF_DEFAULT_MAXWTPS
+#define CONF_DEFAULT_MAXWTPS 200
 #endif
 
 #ifndef CONF_DEFAULT_LOGFILENAME
-	#define CONF_DEFAULT_LOGFILENAME NULL
+#define CONF_DEFAULT_LOGFILENAME NULL
 #endif
 
 #ifndef CONF_DEFAULT_CONFIGFILENAME
-	#define CONF_DEFAULT_CONFIGFILENAME "ac.conf"
+#define CONF_DEFAULT_CONFIGFILENAME "ac.conf"
 #endif
 
 #ifndef CONF_DEFAULT_VENDOR_ID
-	#define CONF_DEFAULT_VENDOR_ID CW_VENDOR_ID_FSF
+#define CONF_DEFAULT_VENDOR_ID CW_VENDOR_ID_FSF
 #endif
 
 #ifndef CONF_DEFAULT_SOFTWARE_VERSION
-	#define CONF_DEFAULT_SOFTWARE_VERSION "AC-Tube 0.01"
+#define CONF_DEFAULT_SOFTWARE_VERSION "AC-Tube 0.01"
 #endif
 
 #ifndef CONF_DEFAULT_HARDWARE_VERSION
-	#define CONF_DEFAULT_HARDWARE_VERSION "Unknown"
+#define CONF_DEFAULT_HARDWARE_VERSION "Unknown"
 #endif
 
 #define CONF_DEFAULT_CISCO_HARDWARE_VERSION ".x01000001"
@@ -64,20 +64,20 @@
 
 
 #ifndef CONF_DEFAULT_CONTROL_PORT
-	#define	CONF_DEFAULT_CONTROL_PORT CAPWAP_CONTROL_PORT
+#define	CONF_DEFAULT_CONTROL_PORT CAPWAP_CONTROL_PORT
 #endif
 
 #ifndef CONF_DEFAULT_LW_CONTROL_PORT
-	#define	CONF_DEFAULT_LW_CONTROL_PORT LWAPP_CONTROL_PORT
+#define	CONF_DEFAULT_LW_CONTROL_PORT LWAPP_CONTROL_PORT
 #endif
 
 
-extern const char * conf_acname;
-extern char * conf_acid;
+extern const char *conf_acname;
+extern char *conf_acid;
 extern int conf_acname_len;
 extern long conf_max_wtps;
-extern char * conf_logfilename;
-extern struct sockaddr_storage * conf_salist;
+extern char *conf_logfilename;
+extern struct sockaddr_storage *conf_salist;
 extern int conf_salist_len;
 
 extern long conf_vendor_id;
@@ -89,36 +89,36 @@ extern bstr_t conf_cisco_software_version;
 
 
 
-extern char ** conf_listen_addrs;
+extern char **conf_listen_addrs;
 extern int conf_listen_addrs_len;
 
-extern struct sockaddr * conf_ac_ips;
+extern struct sockaddr *conf_ac_ips;
 extern int conf_ac_ips_len;
 
 
-extern int read_config(const char * filename);
+extern int read_config(const char *filename);
 
-extern char * conf_control_port;
+extern char *conf_control_port;
 #ifdef WITH_LWAPP
-extern char * conf_lw_control_port;
+extern char *conf_lw_control_port;
 extern int conf_lwapp;
 #endif
 
-extern char * conf_dtls_psk;
-extern char * conf_sslcertfilename;
-extern char * conf_sslkeyfilename;
-extern char * conf_sslkeypass;
-extern char * conf_dtls_psk;
+extern char *conf_dtls_psk;
+extern char *conf_sslcertfilename;
+extern char *conf_sslkeyfilename;
+extern char *conf_sslkeypass;
+extern char *conf_dtls_psk;
 extern int conf_dtls_verify_peer;
-char * conf_sslcipher;
+char *conf_sslcipher;
 
 extern char *conf_image_dir;
 
 
-extern char ** conf_mcast_groups;
+extern char **conf_mcast_groups;
 extern int conf_mcast_groups_len;
 
-extern char ** conf_bcast_addrs;
+extern char **conf_bcast_addrs;
 extern int conf_bcast_addrs_len;
 
 extern long conf_debug_level;
@@ -130,4 +130,9 @@ extern long conf_strict_headers;
 extern int conf_capwap_mode;
 
 
+
+extern int conf_parse_listen_addr(const char *addr, char *saddr, char *port, int *proto);
+
+
+
 #endif