#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- head/channels/chan_sip.c~sipmgr
+++ head/channels/chan_sip.c
@@ -28,6 +28,7 @@
 #include <asterisk/io.h>
 #include <asterisk/rtp.h>
 #include <asterisk/acl.h>
+#include <asterisk/manager.h>
 #include <asterisk/callerid.h>
 #include <asterisk/cli.h>
 #include <asterisk/md5.h>
@@ -3901,6 +3902,28 @@
 	return res;
 }
 
+static char *regstate2str(int regstate)
+{
+	switch(regstate) {
+	case REG_STATE_UNREGISTERED:
+		return "Unregistered";
+	case REG_STATE_REGSENT:
+		return "Request Sent";
+	case REG_STATE_AUTHSENT:
+		return "Auth. Sent";
+	case REG_STATE_REGISTERED:
+		return "Registered";
+	case REG_STATE_REJECTED:
+		return "Rejected";
+	case REG_STATE_TIMEOUT:
+		return "Timeout";
+	case REG_STATE_NOAUTH:
+		return "No Authentication";
+	default:
+		return "Unknown";
+	}
+}
+
 /*--- sip_reg_timeout: Registration timeout, register again */
 static int sip_reg_timeout(void *data)
 {
@@ -3919,6 +3942,7 @@
 		p->needdestroy = 1;
 	}
 	r->regstate=REG_STATE_UNREGISTERED;
+	manager_event(EVENT_FLAG_CALL, "Registry", "Channel: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));
 	r->timeout = -1;
 	res=transmit_register(r, "REGISTER", NULL, NULL);
 	ast_mutex_unlock(&regl.lock);
@@ -4147,6 +4171,7 @@
 	struct sip_peer *p = data;
 	memset(&p->addr, 0, sizeof(p->addr));
 	ast_db_del("SIP/Registry", p->name);
+	manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", p->name);
 	p->expire = -1;
 	ast_device_state_changed("SIP/%s", p->name);
 	if (p->selfdestruct) {
@@ -4246,6 +4271,7 @@
 		p->lastms = 0;
 		if (option_verbose > 2)
 			ast_verbose(VERBOSE_PREFIX_3 "Unregistered SIP '%s'\n", p->name);
+		manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Unregistered\r\n", p->name);
 		return 0;
 	}
 	/* Make sure it's a SIP URL */
@@ -4302,6 +4328,7 @@
 	pvt->expiry = expiry;
 	snprintf(data, sizeof(data), "%s:%d:%d:%s", ast_inet_ntoa(iabuf, sizeof(iabuf), p->addr.sin_addr), ntohs(p->addr.sin_port), expiry, p->username);
 	ast_db_put("SIP/Registry", p->name, data);
+	manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Registered\r\n", p->name);
 	if (inaddrcmp(&p->addr, &oldsin)) {
 		sip_poke_peer(p);
 		if (option_verbose > 2)
@@ -4690,6 +4717,7 @@
 				ast_log(LOG_WARNING, "Failed to parse contact info\n");
 			} else {
 				/* Say OK and ask subsystem to retransmit msg counter */
+				manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Registered\r\n", peer->name);
 				transmit_response_with_date(p, "200 OK", req);
 				peer->lastmsgssent = -1;
 				res = 0;
@@ -5491,28 +5519,6 @@
 #undef FORMAT2
 }
 
-static char *regstate2str(int regstate)
-{
-	switch(regstate) {
-	case REG_STATE_UNREGISTERED:
-		return "Unregistered";
-	case REG_STATE_REGSENT:
-		return "Request Sent";
-	case REG_STATE_AUTHSENT:
-		return "Auth. Sent";
-	case REG_STATE_REGISTERED:
-		return "Registered";
-	case REG_STATE_REJECTED:
-		return "Rejected";
-	case REG_STATE_TIMEOUT:
-		return "Timeout";
-	case REG_STATE_NOAUTH:
-		return "No Authentication";
-	default:
-		return "Unknown";
-	}
-}
-
 /*--- print_group: Print call group and pickup group ---*/
 static void  print_group(int fd, unsigned int group) 
 {
@@ -6384,6 +6390,7 @@
 		   need to hang around for something more "difinitive" */
 		if (resp != 100) {
 			int statechanged = 0;
+			int newstate = 0;
 			peer = p->peerpoke;
 			gettimeofday(&tv, NULL);
 			pingtime = (tv.tv_sec - peer->ps.tv_sec) * 1000 +
@@ -6394,19 +6401,27 @@
 				if (pingtime <= peer->maxms) {
 					ast_log(LOG_NOTICE, "Peer '%s' is now REACHABLE!\n", peer->name);
 					statechanged = 1;
+					newstate = 1;
 				}
 			} else if ((peer->lastms > 0) && (peer->lastms <= peer->maxms)) {
 				if (pingtime > peer->maxms) {
 					ast_log(LOG_NOTICE, "Peer '%s' is now TOO LAGGED!\n", peer->name);
 					statechanged = 1;
+					newstate = 2;
 				}
 			}
 			if (!peer->lastms)
 			    statechanged = 1;
 			peer->lastms = pingtime;
 			peer->call = NULL;
-			if (statechanged)
-			    ast_device_state_changed("SIP/%s", peer->name);
+			if (statechanged) {
+				ast_device_state_changed("SIP/%s", peer->name);
+				if (newstate == 2) {
+					manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Lagged\r\nTime: %d\r\n", peer->name, pingtime);
+				} else {
+					manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Reachable\r\nTime: %d\r\n", peer->name, pingtime);
+				}
+			}
 
 			if (peer->pokeexpire > -1)
 				ast_sched_del(sched, peer->pokeexpire);
@@ -6495,6 +6510,7 @@
 				r=p->registry;
 				if (r) {
 					r->regstate=REG_STATE_REGISTERED;
+					manager_event(EVENT_FLAG_CALL, "Registry", "Channel: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));
 					ast_log(LOG_DEBUG, "Registration successful\n");
 					if (r->timeout > -1) {
 						ast_log(LOG_DEBUG, "Cancelling timeout %d\n", r->timeout);
@@ -7637,8 +7653,10 @@
 	struct sip_peer *peer = data;
 	
 	peer->pokeexpire = -1;
-	if (peer->lastms > -1)
+	if (peer->lastms > -1) {
 		ast_log(LOG_NOTICE, "Peer '%s' is now UNREACHABLE!\n", peer->name);
+		manager_event(EVENT_FLAG_CALL, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Unreachable\r\nTime: %d\r\n", peer->name, -1);
+	}
 	if (peer->call)
 		sip_destroy(peer->call);
 	peer->call = NULL;