Renamed CW_CONTROL_PORT -> CAPWAP_CONTROL_PORT
FossilOrigin-Name: 8d06edf9b1b889422c94f52e85a8ee510e2010c79343b8ee671e7f3ae0c6f454
This commit is contained in:
parent
6eb7bea900
commit
7a0cc27e49
@ -620,7 +620,7 @@ int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *pr
|
||||
char *ctrlport;
|
||||
switch (*proto) {
|
||||
case AC_PROTO_CAPWAP:
|
||||
ctrlport = CW_CONTROL_PORT_STR;
|
||||
ctrlport = CAPWAP_CONTROL_PORT_STR;
|
||||
break;
|
||||
case AC_PROTO_LWAPP:
|
||||
ctrlport = LWAPP_CONTROL_PORT_STR;
|
||||
|
@ -69,7 +69,7 @@ extern struct mod_ac ** conf_mods;
|
||||
|
||||
|
||||
#ifndef CONF_DEFAULT_CONTROL_PORT
|
||||
#define CONF_DEFAULT_CONTROL_PORT CW_CONTROL_PORT
|
||||
#define CONF_DEFAULT_CONTROL_PORT CAPWAP_CONTROL_PORT
|
||||
#endif
|
||||
|
||||
#ifndef CONF_DEFAULT_LW_CONTROL_PORT
|
||||
|
@ -48,12 +48,12 @@
|
||||
/** CAPWAP Version */
|
||||
#define CAPWAP_VERSION (0)
|
||||
|
||||
#define CW_IANA_ENTERPRISE_NUMBER 0
|
||||
#define CAPWAP_IANA_ENTERPRISE_NUMBER 0
|
||||
|
||||
/** CAPWAP Control Port*/
|
||||
#define CW_CONTROL_PORT 5246
|
||||
#define CAPWAP_CONTROL_PORT 5246
|
||||
/** CAPWAP Control Port as String */
|
||||
#define CW_CONTROL_PORT_STR "5246"
|
||||
#define CAPWAP_CONTROL_PORT_STR "5246"
|
||||
|
||||
/** CAPWAP Data Port */
|
||||
#define CAPWAP_DATA_PPORT 5247
|
||||
|
@ -62,7 +62,7 @@ int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
|
||||
struct sockaddr_in addr;
|
||||
memcpy(&addr.sin_addr,data,4);
|
||||
addr.sin_family=AF_INET;
|
||||
sock_setport((struct sockaddr*)&addr,CW_CONTROL_PORT);
|
||||
sock_setport((struct sockaddr*)&addr,CAPWAP_CONTROL_PORT);
|
||||
memcpy(&acip->ip,&addr,sizeof(addr));
|
||||
acip->index = cw_get_word(data+4);
|
||||
}
|
||||
@ -72,7 +72,7 @@ int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
|
||||
memset (&addr,0,sizeof(addr));
|
||||
memcpy(&addr.sin6_addr,data,16);
|
||||
addr.sin6_family=AF_INET6;
|
||||
sock_setport((struct sockaddr*)&addr,CW_CONTROL_PORT);
|
||||
sock_setport((struct sockaddr*)&addr,CAPWAP_CONTROL_PORT);
|
||||
memcpy(&acip->ip,&addr,sizeof(addr));
|
||||
acip->index = cw_get_word(data+16);
|
||||
}
|
||||
|
@ -209,7 +209,7 @@ int wtpconf_ac_list()
|
||||
|
||||
int wtpconf_preinit()
|
||||
{
|
||||
conf_control_port=strdup(CW_CONTROL_PORT_STR);
|
||||
conf_control_port=strdup(CAPWAP_CONTROL_PORT_STR);
|
||||
conf_dtls_cipher=strdup(CONF_DEFAULT_DTLS_CIPHER);
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user