diff --git a/libs/openzap/src/m3ua_client.c b/libs/openzap/src/m3ua_client.c
new file mode 100644
index 0000000000..aaeb5ae9e0
--- /dev/null
+++ b/libs/openzap/src/m3ua_client.c
@@ -0,0 +1,332 @@
+/*
+ *  m3ua_client.c
+ *  openzap
+ *
+ *  Created by Shane Burrell on 4/3/08.
+ *  Copyright 2008 Shane Burrell. All rights reserved.
+ *
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#include "openzap.h"
+#include <m3ua_client.h>
+
+
+#ifndef HAVE_GETHOSTBYNAME_R
+extern int gethostbyname_r (const char *__name,
+							struct hostent *__result_buf,
+							char *__buf, size_t __buflen,
+							struct hostent **__result,
+							int *__h_errnop);
+#endif
+
+struct m3uac_map {
+	uint32_t event_id;
+	const char *name;
+};
+
+static struct m3uac_map m3uac_table[] = {
+	{SIGBOOST_EVENT_CALL_START, "CALL_START"},
+	{SIGBOOST_EVENT_CALL_START_ACK, "CALL_START_ACK"},
+	{SIGBOOST_EVENT_CALL_START_NACK, "CALL_START_NACK"},
+	{SIGBOOST_EVENT_CALL_START_NACK_ACK, "CALL_START_NACK_ACK"},
+	{SIGBOOST_EVENT_CALL_ANSWERED, "CALL_ANSWERED"},
+	{SIGBOOST_EVENT_CALL_STOPPED, "CALL_STOPPED"},
+	{SIGBOOST_EVENT_CALL_STOPPED_ACK, "CALL_STOPPED_ACK"},
+	{SIGBOOST_EVENT_SYSTEM_RESTART, "SYSTEM_RESTART"},
+	{SIGBOOST_EVENT_SYSTEM_RESTART_ACK, "SYSTEM_RESTART_ACK"},
+	{SIGBOOST_EVENT_HEARTBEAT, "HEARTBEAT"},
+	{SIGBOOST_EVENT_INSERT_CHECK_LOOP, "LOOP START"},
+	{SIGBOOST_EVENT_REMOVE_CHECK_LOOP, "LOOP STOP"} 
+}; 
+
+
+
+static int create_conn_socket(m3uac_connection_t *mcon, char *local_ip, int local_port, char *ip, int port)
+{
+	int rc;
+	struct hostent *result, *local_result;
+	char buf[512], local_buf[512];
+	int err = 0;
+
+	memset(&mcon->remote_hp, 0, sizeof(mcon->remote_hp));
+	memset(&mcon->local_hp, 0, sizeof(mcon->local_hp));
+	mcon->socket = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP);
+ 
+	zap_log(ZAP_LOG_DEBUG, "Creating L=%s:%d R=%s:%d\n",
+			local_ip,local_port,ip,port);
+
+	if (mcon->socket >= 0) {
+		int flag;
+
+		flag = 1;
+		gethostbyname_r(ip, &mcon->remote_hp, buf, sizeof(buf), &result, &err);
+		gethostbyname_r(local_ip, &mcon->local_hp, local_buf, sizeof(local_buf), &local_result, &err);
+		if (result && local_result) {
+			mcon->remote_addr.sin_family = mcon->remote_hp.h_addrtype;
+			memcpy((char *) &mcon->remote_addr.sin_addr.s_addr, mcon->remote_hp.h_addr_list[0], mcon->remote_hp.h_length);
+			mcon->remote_addr.sin_port = htons(port);
+
+			mcon->local_addr.sin_family = mcon->local_hp.h_addrtype;
+			memcpy((char *) &mcon->local_addr.sin_addr.s_addr, mcon->local_hp.h_addr_list[0], mcon->local_hp.h_length);
+			mcon->local_addr.sin_port = htons(local_port);
+
+
+			setsockopt(mcon->socket, IPPROTO_SCTP, SCTP_NODELAY, (char *)&flag, sizeof(int));
+
+			rc=listen(mcon->socket,100);
+			if (rc) {
+			close(mcon->socket);
+			mcon->socket = -1;
+			
+			}
+		}
+	}
+
+	zap_mutex_create(&mcon->mutex);
+
+	return mcon->socket;
+}
+
+int m3uac_connection_close(m3uac_connection_t *mcon)
+{
+	if (mcon->socket > -1) {
+		close(mcon->socket);
+	}
+
+	zap_mutex_lock(mcon->mutex);
+	zap_mutex_unlock(mcon->mutex);
+	zap_mutex_destroy(&mcon->mutex);
+	memset(mcon, 0, sizeof(*mcon));
+	mcon->socket = -1;
+
+	return 0;
+}
+
+int m3uac_connection_open(m3uac_connection_t *mcon, char *local_ip, int local_port, char *ip, int port)
+{
+	create_conn_socket(mcon, local_ip, local_port, ip, port);
+	return mcon->socket;
+}
+
+
+int m3uac_exec_command(m3uac_connection_t *mcon, int span, int chan, int id, int cmd, int cause)
+{
+    m3uac_event_t oevent;
+    int retry = 5;
+
+    m3uac_event_init(&oevent, cmd, chan, span);
+    oevent.release_cause = cause;
+
+	if (cmd == SIGBOOST_EVENT_SYSTEM_RESTART) {
+		mcon->rxseq_reset = 1;
+		mcon->txseq = 0;
+		mcon->rxseq = 0;
+		mcon->txwindow = 0;
+	}
+
+    if (id >= 0) {
+        oevent.call_setup_id = id;
+    }
+
+    while (m3uac_connection_write(mcon, &oevent) <= 0) {
+        if (--retry <= 0) {
+            zap_log(ZAP_LOG_CRIT, "Failed to tx on M3UA socket: %s\n", strerror(errno));
+            return -1;
+        } else {
+            zap_log(ZAP_LOG_WARNING, "Failed to tx on M3UA socket: %s :retry %i\n", strerror(errno), retry);
+			zap_sleep(1);
+        }
+    }
+
+    return 0;
+}
+
+
+
+m3uac_event_t *m3uac_connection_read(m3uac_connection_t *mcon, int iteration)
+{
+	unsigned int fromlen = sizeof(struct sockaddr_in);
+	int bytes = 0;
+
+	bytes = recvfrom(mcon->socket, &mcon->event, sizeof(mcon->event), MSG_DONTWAIT, 
+					 (struct sockaddr *) &mcon->local_addr, &fromlen);
+
+	if (bytes == sizeof(mcon->event) || bytes == (sizeof(mcon->event)-sizeof(uint32_t))) {
+
+		if (mcon->rxseq_reset) {
+			if (mcon->event.event_id == SIGBOOST_EVENT_SYSTEM_RESTART_ACK) {
+				zap_log(ZAP_LOG_DEBUG, "Rx sync ok\n");
+				mcon->rxseq = mcon->event.fseqno;
+				return &mcon->event;
+			}
+			errno=EAGAIN;
+			zap_log(ZAP_LOG_DEBUG, "Waiting for rx sync...\n");
+			return NULL;
+		}
+		
+		mcon->txwindow = mcon->txseq - mcon->event.bseqno;
+		mcon->rxseq++;
+
+		if (mcon->rxseq != mcon->event.fseqno) {
+			zap_log(ZAP_LOG_CRIT, "Invalid Sequence Number Expect=%i Rx=%i\n", mcon->rxseq, mcon->event.fseqno);
+			return NULL;
+		}
+
+		return &mcon->event;
+	} else {
+		if (iteration == 0) {
+			zap_log(ZAP_LOG_CRIT, "Invalid Event length from boost rxlen=%i evsz=%i\n", bytes, sizeof(mcon->event));
+			return NULL;
+		}
+	}
+
+	return NULL;
+}
+
+m3uac_event_t *m3uac_connection_readp(m3uac_connection_t *mcon, int iteration)
+{
+	unsigned int fromlen = sizeof(struct sockaddr_in);
+	int bytes = 0;
+
+	bytes = recvfrom(mcon->socket, &mcon->event, sizeof(mcon->event), MSG_DONTWAIT, (struct sockaddr *) &mcon->local_addr, &fromlen);
+
+	if (bytes == sizeof(mcon->event) || bytes == (sizeof(mcon->event)-sizeof(uint32_t))) {
+		return &mcon->event;
+	} else {
+		if (iteration == 0) {
+			zap_log(ZAP_LOG_CRIT, "Critical Error: PQ Invalid Event lenght from boost rxlen=%i evsz=%i\n", bytes, sizeof(mcon->event));
+			return NULL;
+		}
+	}
+
+	return NULL;
+}
+
+
+int m3uac_connection_write(m3uac_connection_t *mcon, ss7bc_event_t *event)
+{
+	int err;
+
+	if (!event || mcon->socket < 0 || !mcon->mutex) {
+		zap_log(ZAP_LOG_DEBUG,  "Critical Error: No Event Device\n");
+		return -EINVAL;
+	}
+
+	if (event->span > 16 || event->chan > 31) {
+		zap_log(ZAP_LOG_CRIT, "Critical Error: TX Cmd=%s Invalid Span=%i Chan=%i\n", m3uac_event_id_name(event->event_id), event->span,event->chan);
+		return -1;
+	}
+
+	gettimeofday(&event->tv,NULL);
+	
+	zap_mutex_lock(mcon->mutex);
+	event->fseqno = mcon->txseq++;
+	event->bseqno = mcon->rxseq;
+	err = sendto(mcon->socket, event, sizeof(m3uac_event_t), 0, (struct sockaddr *) &mcon->remote_addr, sizeof(mcon->remote_addr));
+	zap_mutex_unlock(mcon->mutex);
+
+	if (err != sizeof(m3uac_event_t)) {
+		err = -1;
+	}
+	
+ 	zap_log(ZAP_LOG_DEBUG, "TX EVENT: %s:(%X) [w%dg%d] Rc=%i CSid=%i Seq=%i Cd=[%s] Ci=[%s]\n",
+			m3uac_event_id_name(event->event_id),
+			event->event_id,
+			event->span+1,
+			event->chan+1,
+			event->release_cause,
+			event->call_setup_id,
+			event->fseqno,
+			(event->called_number_digits_count ? (char *) event->called_number_digits : "N/A"),
+			(event->calling_number_digits_count ? (char *) event->calling_number_digits : "N/A")
+			);
+
+	return err;
+}
+
+void m3uac_call_init(m3uac_event_t *event, const char *calling, const char *called, int setup_id)
+{
+	memset(event, 0, sizeof(m3uac_event_t));
+	event->event_id = SIGBOOST_EVENT_CALL_START;
+
+	if (calling) {
+		strncpy((char*)event->calling_number_digits, calling, sizeof(event->calling_number_digits)-1);
+		event->calling_number_digits_count = strlen(calling);
+	}
+
+	if (called) {
+		strncpy((char*)event->called_number_digits, called, sizeof(event->called_number_digits)-1);
+		event->called_number_digits_count = strlen(called);
+	}
+		
+	event->call_setup_id = setup_id;
+	
+}
+
+void m3uac_event_init(m3uac_event_t *event, m3uac_event_id_t event_id, int chan, int span) 
+{
+	memset(event, 0, sizeof(ss7bc_event_t));
+	event->event_id = event_id;
+	event->chan = chan;
+	event->span = span;
+}
+
+const char *m3uac_event_id_name(uint32_t event_id)
+{
+	unsigned int x;
+	const char *ret = NULL;
+
+	for (x = 0 ; x < sizeof(m3uac_table)/sizeof(struct m3uac_map); x++) {
+		if (m3uac_table[x].event_id == event_id) {
+			ret = m3uac_table[x].name;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */
+
+
diff --git a/libs/openzap/src/m3ua_client.h b/libs/openzap/src/m3ua_client.h
new file mode 100644
index 0000000000..e75a6dcee2
--- /dev/null
+++ b/libs/openzap/src/m3ua_client.h
@@ -0,0 +1,120 @@
+/*
+ *  m3ua_client.h
+ *  openzap
+ *
+ *  Created by Shane Burrell on 4/3/08.
+ *  Copyright 2008 Shane Burrell. All rights reserved.
+ *
+
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ctype.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include <arpa/inet.h>
+#include <stdarg.h>
+#include <netdb.h>
+#include <sigboost.h>
+#include <sys/time.h>
+
+typedef t_m3ua m3uac_event_t;
+typedef uint32_t m3uac_event_id_t;
+
+typedef struct m3uac_ip_cfg
+{
+	char local_ip[25];
+	int local_port;
+	char remote_ip[25];
+	int remote_port;
+}m3uac_ip_cfg_t;
+
+struct m3uac_connection {
+	zap_socket_t socket;
+	struct sockaddr_in local_addr;
+	struct sockaddr_in remote_addr;
+	m3uac_event_t event;
+	struct hostent remote_hp;
+	struct hostent local_hp;
+	unsigned int flags;
+	zap_mutex_t *mutex;
+	FILE *log;
+	unsigned int txseq;
+	unsigned int rxseq;
+	unsigned int txwindow;
+	unsigned int rxseq_reset;
+	m3uac_ip_cfg_t cfg;
+	uint32_t hb_elapsed;
+	int up;
+};
+
+typedef enum {
+	MSU_FLAG_EVENT = (1 << 0)
+} ss7bc_flag_t;
+
+typedef struct m3uac_connection m3uac_connection_t;
+
+static inline void sctp_no_nagle(int socket)
+{
+    int flag = 1;
+    setsockopt(socket, IPPROTO_SCTP, SCTP_NODELAY, (char *) &flag, sizeof(int));
+}
+
+int m3uac_connection_close(m3uac_connection_t *mcon);
+int m3uac_connection_open(m3uac_connection_t *mcon, char *local_ip, int local_port, char *ip, int port);
+m3uac_event_t *ss7bc_connection_read(m3uac_connection_t *mcon, int iteration);
+m3uac_event_t *ss7bc_connection_readp(m3uac_connection_t *mcon, int iteration);
+int m3uac_connection_write(m3uac_connection_t *mcon, ss7bc_event_t *event);
+void m3uac_event_init(m3uac_event_t *event, m3uac_event_id_t event_id, int chan, int span);
+void m3uac_call_init(m3uac_event_t *event, const char *calling, const char *called, int setup_id);
+const char *m3uac_event_id_name(uint32_t event_id);
+int m3uac_exec_command(m3uac_connection_t *mcon, int span, int chan, int id, int cmd, int cause);
+
+#endif
+
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */