diff --git a/src/capwap/conn_detect_capwap.c b/src/capwap/conn_detect_capwap.c
new file mode 100644
index 00000000..d1ca1063
--- /dev/null
+++ b/src/capwap/conn_detect_capwap.c
@@ -0,0 +1,35 @@
+/*
+    This file is part of libcapwap.
+
+    libcapwap is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    libcapwap is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "capwap.h"
+#include "wtpinfo.h"
+#include "conn.h"
+#include "cw_log.h"
+#include "sock.h"
+
+void conn_detect_capwap(struct conn * conn, struct wtpinfo * wtpinfo)
+{
+	if (wtpinfo->software_vendor_id == CW_VENDOR_ID_CISCO){
+		cw_dbg(DBG_CW_INFO,"Setting capwap mode *Cisco* on connection %s",sock_addr2str(&conn->addr));
+		conn->capwap_mode = CWMODE_CISCO;
+		return;
+	}
+
+	conn->capwap_mode = CWMODE_STD;
+		
+}
diff --git a/src/capwap/cw_readelem_maximum_message_length.c b/src/capwap/cw_readelem_maximum_message_length.c
new file mode 100644
index 00000000..7dd5f75d
--- /dev/null
+++ b/src/capwap/cw_readelem_maximum_message_length.c
@@ -0,0 +1,37 @@
+/*
+    This file is part of libcapwap.
+
+    libcapwap is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    libcapwap is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "capwap.h"
+#include "cw_util.h"
+#include "cw_log.h"
+
+int cw_readelem_maximum_message_length(uint16_t *dst, int type,uint8_t *msgelem, int len)
+{
+	if (type != CWMSGELEM_MAXIMUM_MESSAGE_LENGTH)
+		return 0;
+	
+	if (len!=2){
+		cw_dbg(DBG_CW_RFC,"Discarding MAXIMUM_MESSAGE_LENTGH msgelem, wrong size, type=%d,len=%d",type,len);
+		return 0;
+	}
+		
+	*dst = ntohs(* ((uint16_t*)msgelem));
+	return 1;
+}
+
+