[svn-commits] mmichelson: branch group/manager2 r110376 - in /team/group/manager2: apps/ ch...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Mar 20 17:26:03 CDT 2008


Author: mmichelson
Date: Thu Mar 20 17:26:03 2008
New Revision: 110376

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110376
Log:
Changed ast_event_new to no longer require passing the payload type.


Modified:
    team/group/manager2/apps/app_queue.c
    team/group/manager2/apps/app_voicemail.c
    team/group/manager2/channels/chan_zap.c
    team/group/manager2/main/devicestate.c
    team/group/manager2/main/event.c

Modified: team/group/manager2/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/manager2/apps/app_queue.c?view=diff&rev=110376&r1=110375&r2=110376
==============================================================================
--- team/group/manager2/apps/app_queue.c (original)
+++ team/group/manager2/apps/app_queue.c Thu Mar 20 17:26:03 2008
@@ -707,15 +707,15 @@
 				}
 
 				event = ast_event_new(AST_EVENT_QUEUE_MEMBER_STATUS,
-						AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-						AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, cur->interface,
-						AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, cur->membername,
-						AST_EVENT_IE_QUEUE_MEMBERSHIP, AST_EVENT_IE_PLTYPE_STR, cur->dynamic ? "dynamic " : cur->realtime ? "realtime" : "static",
-						AST_EVENT_IE_QUEUE_PENALTY, AST_EVENT_IE_PLTYPE_UINT, cur->penalty,
-						AST_EVENT_IE_QUEUE_CALLS, AST_EVENT_IE_PLTYPE_UINT, cur->calls,
-						AST_EVENT_IE_QUEUE_LASTCALL, AST_EVENT_IE_PLTYPE_UINT, cur->lastcall,
-						AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_STR, devstate2str(cur->status),
-						AST_EVENT_IE_QUEUE_PAUSED, AST_EVENT_IE_PLTYPE_UINT, cur->paused,
+						AST_EVENT_IE_QUEUE_NAME, q->name,
+						AST_EVENT_IE_DEVICE, cur->interface,
+						AST_EVENT_IE_QUEUE_MEMBERNAME, cur->membername,
+						AST_EVENT_IE_QUEUE_MEMBERSHIP, cur->dynamic ? "dynamic " : cur->realtime ? "realtime" : "static",
+						AST_EVENT_IE_QUEUE_PENALTY, cur->penalty,
+						AST_EVENT_IE_QUEUE_CALLS, cur->calls,
+						AST_EVENT_IE_QUEUE_LASTCALL, cur->lastcall,
+						AST_EVENT_IE_STATE, devstate2str(cur->status),
+						AST_EVENT_IE_QUEUE_PAUSED, cur->paused,
 						AST_EVENT_IE_END);
 				ast_event_queue(event);
 
@@ -1737,13 +1737,13 @@
 		res = 0;
 
 		event = ast_event_new(AST_EVENT_QUEUE_JOIN,
-				AST_EVENT_IE_SOURCE_CHANNEL, AST_EVENT_IE_PLTYPE_STR, qe->chan->name,
-				AST_EVENT_IE_CALLERIDNUM, AST_EVENT_IE_PLTYPE_STR, qe->chan->cid.cid_num,
-				AST_EVENT_IE_CALLERIDNAME, AST_EVENT_IE_PLTYPE_STR, qe->chan->cid.cid_name,
-				AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-				AST_EVENT_IE_QUEUE_POSITION, AST_EVENT_IE_PLTYPE_UINT, qe->pos,
-				AST_EVENT_IE_QUEUE_COUNT, AST_EVENT_IE_PLTYPE_UINT, q->count,
-				AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, qe->chan->uniqueid,
+				AST_EVENT_IE_SOURCE_CHANNEL, qe->chan->name,
+				AST_EVENT_IE_CALLERIDNUM, qe->chan->cid.cid_num,
+				AST_EVENT_IE_CALLERIDNAME, qe->chan->cid.cid_name,
+				AST_EVENT_IE_QUEUE_NAME, q->name,
+				AST_EVENT_IE_QUEUE_POSITION, qe->pos,
+				AST_EVENT_IE_QUEUE_COUNT, q->count,
+				AST_EVENT_IE_SOURCE_UNIQUEID, qe->chan->uniqueid,
 				AST_EVENT_IE_END);
 
 		ast_event_queue(event);
@@ -1958,10 +1958,10 @@
 			q->count--;
 
 			event = ast_event_new(AST_EVENT_QUEUE_LEAVE,
-					AST_EVENT_IE_SOURCE_CHANNEL, AST_EVENT_IE_PLTYPE_STR, qe->chan->name,
-					AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-					AST_EVENT_IE_QUEUE_COUNT, AST_EVENT_IE_PLTYPE_UINT, q->count,
-					AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR,  qe->chan->uniqueid,
+					AST_EVENT_IE_SOURCE_CHANNEL, qe->chan->name,
+					AST_EVENT_IE_QUEUE_NAME, q->name,
+					AST_EVENT_IE_QUEUE_COUNT, q->count,
+					AST_EVENT_IE_SOURCE_UNIQUEID,  qe->chan->uniqueid,
 					AST_EVENT_IE_END);
 
 			ast_event_queue(event);
@@ -2203,17 +2203,17 @@
 		struct ast_event *event = NULL;
 
 		event = ast_event_new(AST_EVENT_QUEUE_MEMBER_CALLED,
-				AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, qe->parent->name,
-				AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, tmp->interface,
-				AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, tmp->member->membername,
-				AST_EVENT_IE_SOURCE_CHANNEL, AST_EVENT_IE_PLTYPE_STR, qe->chan->name,
-				AST_EVENT_IE_DESTINATION_CHANNEL, AST_EVENT_IE_PLTYPE_STR, tmp->chan->name,
-				AST_EVENT_IE_CALLERIDNUM, AST_EVENT_IE_PLTYPE_STR, S_OR(tmp->chan->cid.cid_num, "unknown"),
-				AST_EVENT_IE_CALLERIDNAME, AST_EVENT_IE_PLTYPE_STR, S_OR(tmp->chan->cid.cid_name, "unknown"),
-				AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, qe->chan->context,
-				AST_EVENT_IE_EXTENSION, AST_EVENT_IE_PLTYPE_STR, qe->chan->exten,
-				AST_EVENT_IE_PRIORITY, AST_EVENT_IE_PLTYPE_UINT, qe->chan->priority,
-				AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, qe->chan->uniqueid,
+				AST_EVENT_IE_QUEUE_NAME, qe->parent->name,
+				AST_EVENT_IE_DEVICE, tmp->interface,
+				AST_EVENT_IE_QUEUE_MEMBERNAME, tmp->member->membername,
+				AST_EVENT_IE_SOURCE_CHANNEL, qe->chan->name,
+				AST_EVENT_IE_DESTINATION_CHANNEL, tmp->chan->name,
+				AST_EVENT_IE_CALLERIDNUM, S_OR(tmp->chan->cid.cid_num, "unknown"),
+				AST_EVENT_IE_CALLERIDNAME, S_OR(tmp->chan->cid.cid_name, "unknown"),
+				AST_EVENT_IE_CONTEXT, qe->chan->context,
+				AST_EVENT_IE_EXTENSION, qe->chan->exten,
+				AST_EVENT_IE_PRIORITY, qe->chan->priority,
+				AST_EVENT_IE_SOURCE_UNIQUEID, qe->chan->uniqueid,
 				AST_EVENT_IE_END);
 
 		if (qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES) {
@@ -2391,11 +2391,11 @@
 	set_queue_variables(qe);
 	
 	event = ast_event_new(AST_EVENT_QUEUE_CALLER_ABANDON,
-			AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, qe->parent->name,
-			AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, qe->chan->uniqueid,
-			AST_EVENT_IE_QUEUE_POSITION, AST_EVENT_IE_PLTYPE_UINT, qe->pos,
-			AST_EVENT_IE_QUEUE_ORIGINAL_POSITION, AST_EVENT_IE_PLTYPE_UINT, qe->opos,
-			AST_EVENT_IE_QUEUE_HOLDTIME, AST_EVENT_IE_PLTYPE_UINT, (time(NULL) - qe->start),
+			AST_EVENT_IE_QUEUE_NAME, qe->parent->name,
+			AST_EVENT_IE_SOURCE_UNIQUEID, qe->chan->uniqueid,
+			AST_EVENT_IE_QUEUE_POSITION, qe->pos,
+			AST_EVENT_IE_QUEUE_ORIGINAL_POSITION, qe->opos,
+			AST_EVENT_IE_QUEUE_HOLDTIME, (time(NULL) - qe->start),
 			AST_EVENT_IE_END);
 
 	ast_event_queue(event);
@@ -2994,14 +2994,14 @@
 	}
 
 	event = ast_event_new(AST_EVENT_QUEUE_MEMBER_COMPLETE,
-			AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, queuename,
-			AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, qe->chan->uniqueid,
-			AST_EVENT_IE_DESTINATION_CHANNEL, AST_EVENT_IE_PLTYPE_STR, peer->name,
-			AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, member->interface,
-			AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, member->membername,
-			AST_EVENT_IE_QUEUE_HOLDTIME, AST_EVENT_IE_PLTYPE_UINT, callstart - qe->start,
-			AST_EVENT_IE_QUEUE_TALKTIME, AST_EVENT_IE_PLTYPE_UINT, time(NULL) - callstart,
-			AST_EVENT_IE_QUEUE_REASON, AST_EVENT_IE_PLTYPE_STR, reason,
+			AST_EVENT_IE_QUEUE_NAME, queuename,
+			AST_EVENT_IE_SOURCE_UNIQUEID, qe->chan->uniqueid,
+			AST_EVENT_IE_DESTINATION_CHANNEL, peer->name,
+			AST_EVENT_IE_DEVICE, member->interface,
+			AST_EVENT_IE_QUEUE_MEMBERNAME, member->membername,
+			AST_EVENT_IE_QUEUE_HOLDTIME, callstart - qe->start,
+			AST_EVENT_IE_QUEUE_TALKTIME, time(NULL) - callstart,
+			AST_EVENT_IE_QUEUE_REASON, reason,
 			AST_EVENT_IE_END);
 
 	if (qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES) {
@@ -3340,11 +3340,11 @@
 				record_abandoned(qe);
 				if (qe->parent->eventwhencalled) {
 					event = ast_event_new(AST_EVENT_QUEUE_MEMBER_DUMP,
-							AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, queuename,
-							AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, qe->chan->uniqueid,
-							AST_EVENT_IE_DESTINATION_CHANNEL, AST_EVENT_IE_PLTYPE_STR, peer->name,
-							AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, member->interface,
-							AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, member->membername,
+							AST_EVENT_IE_QUEUE_NAME, queuename,
+							AST_EVENT_IE_SOURCE_UNIQUEID, qe->chan->uniqueid,
+							AST_EVENT_IE_DESTINATION_CHANNEL, peer->name,
+							AST_EVENT_IE_DEVICE, member->interface,
+							AST_EVENT_IE_QUEUE_MEMBERNAME, member->membername,
 							AST_EVENT_IE_END);
 
 					if (qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES) {
@@ -3628,14 +3628,14 @@
 			ast_copy_string(qe->chan->cdr->dstchannel, member->membername, sizeof(qe->chan->cdr->dstchannel));
 		if (qe->parent->eventwhencalled) {
 			event = ast_event_new(AST_EVENT_QUEUE_MEMBER_CONNECT,
-					AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, queuename,
-					AST_EVENT_IE_SOURCE_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, qe->chan->uniqueid,
-					AST_EVENT_IE_DESTINATION_CHANNEL, AST_EVENT_IE_PLTYPE_STR, peer->name,
-					AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, member->interface,
-					AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, member->membername,
-					AST_EVENT_IE_QUEUE_HOLDTIME, AST_EVENT_IE_PLTYPE_UINT, time(NULL) - qe->start,
-					AST_EVENT_IE_DESTINATION_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, peer->uniqueid,
-					AST_EVENT_IE_QUEUE_RINGTIME, AST_EVENT_IE_PLTYPE_UINT, orig - to > 0 ? (orig - to) / 1000 : 0,
+					AST_EVENT_IE_QUEUE_NAME, queuename,
+					AST_EVENT_IE_SOURCE_UNIQUEID, qe->chan->uniqueid,
+					AST_EVENT_IE_DESTINATION_CHANNEL, peer->name,
+					AST_EVENT_IE_DEVICE, member->interface,
+					AST_EVENT_IE_QUEUE_MEMBERNAME, member->membername,
+					AST_EVENT_IE_QUEUE_HOLDTIME, time(NULL) - qe->start,
+					AST_EVENT_IE_DESTINATION_UNIQUEID, peer->uniqueid,
+					AST_EVENT_IE_QUEUE_RINGTIME, orig - to > 0 ? (orig - to) / 1000 : 0,
 					AST_EVENT_IE_END);
 
 			if (qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES) {
@@ -3779,9 +3779,9 @@
 			}
 			q->membercount--;
 			event = ast_event_new(AST_EVENT_QUEUE_MEMBER_REMOVED,
-					AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-					AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, mem->interface,
-					AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, mem->membername,
+					AST_EVENT_IE_QUEUE_NAME, q->name,
+					AST_EVENT_IE_DEVICE, mem->interface,
+					AST_EVENT_IE_QUEUE_MEMBERNAME, mem->membername,
 					AST_EVENT_IE_END);
 
 			ast_event_queue(event);
@@ -3833,11 +3833,11 @@
 			q->membercount++;
 			/*I'm leaving out some of the original manager event stuff because it's just stupid.*/
 			event = ast_event_new(AST_EVENT_QUEUE_MEMBER_ADDED,
-					AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-					AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, new_member->interface,
-					AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, new_member->membername,
-					AST_EVENT_IE_QUEUE_MEMBERSHIP, AST_EVENT_IE_PLTYPE_STR, "dynamic",
-					AST_EVENT_IE_QUEUE_PENALTY, AST_EVENT_IE_PLTYPE_UINT, new_member->penalty,
+					AST_EVENT_IE_QUEUE_NAME, q->name,
+					AST_EVENT_IE_DEVICE, new_member->interface,
+					AST_EVENT_IE_QUEUE_MEMBERNAME, new_member->membername,
+					AST_EVENT_IE_QUEUE_MEMBERSHIP, "dynamic",
+					AST_EVENT_IE_QUEUE_PENALTY, new_member->penalty,
 					AST_EVENT_IE_END);
 
 			ast_event_queue(event);
@@ -3895,20 +3895,20 @@
 				
 				if (!ast_strlen_zero(reason)) {
 					event = ast_event_new(AST_EVENT_QUEUE_MEMBER_PAUSED,
-							AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-							AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, mem->interface,
-							AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, mem->membername,
-							AST_EVENT_IE_QUEUE_PAUSED, AST_EVENT_IE_PLTYPE_UINT, paused,
-							AST_EVENT_IE_QUEUE_REASON, AST_EVENT_IE_PLTYPE_STR, reason,
+							AST_EVENT_IE_QUEUE_NAME, q->name,
+							AST_EVENT_IE_DEVICE, mem->interface,
+							AST_EVENT_IE_QUEUE_MEMBERNAME, mem->membername,
+							AST_EVENT_IE_QUEUE_PAUSED, paused,
+							AST_EVENT_IE_QUEUE_REASON, reason,
 							AST_EVENT_IE_END);
 
 					ast_event_queue(event);
 				} else {
 					event = ast_event_new(AST_EVENT_QUEUE_MEMBER_PAUSED,
-							AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-							AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, mem->interface,
-							AST_EVENT_IE_QUEUE_MEMBERNAME, AST_EVENT_IE_PLTYPE_STR, mem->membername,
-							AST_EVENT_IE_QUEUE_PAUSED, AST_EVENT_IE_PLTYPE_UINT, paused,
+							AST_EVENT_IE_QUEUE_NAME, q->name,
+							AST_EVENT_IE_DEVICE, mem->interface,
+							AST_EVENT_IE_QUEUE_MEMBERNAME, mem->membername,
+							AST_EVENT_IE_QUEUE_PAUSED, paused,
 							AST_EVENT_IE_END);
 
 					ast_event_queue(event);
@@ -3948,9 +3948,9 @@
 				
 				ast_queue_log(q->name, "NONE", interface, "PENALTY", "%d", penalty);
 				event = ast_event_new(AST_EVENT_QUEUE_MEMBER_PENALTY,
-						AST_EVENT_IE_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
-						AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, mem->interface,
-						AST_EVENT_IE_QUEUE_PENALTY, AST_EVENT_IE_PLTYPE_UINT, penalty,
+						AST_EVENT_IE_QUEUE_NAME, q->name,
+						AST_EVENT_IE_DEVICE, mem->interface,
+						AST_EVENT_IE_QUEUE_PENALTY, penalty,
 						AST_EVENT_IE_END);
 
 				ast_event_queue(event);

Modified: team/group/manager2/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/manager2/apps/app_voicemail.c?view=diff&rev=110376&r1=110375&r2=110376
==============================================================================
--- team/group/manager2/apps/app_voicemail.c (original)
+++ team/group/manager2/apps/app_voicemail.c Thu Mar 20 17:26:03 2008
@@ -4177,10 +4177,10 @@
 		context = "default";
 
 	if (!(event = ast_event_new(AST_EVENT_MWI,
-			AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, mailbox,
-			AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, context,
-			AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_UINT, new,
-			AST_EVENT_IE_OLDMSGS, AST_EVENT_IE_PLTYPE_UINT, old,
+			AST_EVENT_IE_MAILBOX, mailbox,
+			AST_EVENT_IE_CONTEXT, context,
+			AST_EVENT_IE_NEWMSGS, new,
+			AST_EVENT_IE_OLDMSGS, old,
 			AST_EVENT_IE_END))) {
 		return;
 	}

Modified: team/group/manager2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/manager2/channels/chan_zap.c?view=diff&rev=110376&r1=110375&r2=110376
==============================================================================
--- team/group/manager2/channels/chan_zap.c (original)
+++ team/group/manager2/channels/chan_zap.c Thu Mar 20 17:26:03 2008
@@ -1940,10 +1940,10 @@
 		context = "default";
 
 	if (!(event = ast_event_new(AST_EVENT_MWI,
-			AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, mailbox,
-			AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, context,
-			AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_UINT, thereornot,
-			AST_EVENT_IE_OLDMSGS, AST_EVENT_IE_PLTYPE_UINT, thereornot,
+			AST_EVENT_IE_MAILBOX, mailbox,
+			AST_EVENT_IE_CONTEXT, context,
+			AST_EVENT_IE_NEWMSGS, thereornot,
+			AST_EVENT_IE_OLDMSGS, thereornot,
 			AST_EVENT_IE_END))) {
 		return;
 	}

Modified: team/group/manager2/main/devicestate.c
URL: http://svn.digium.com/view/asterisk/team/group/manager2/main/devicestate.c?view=diff&rev=110376&r1=110375&r2=110376
==============================================================================
--- team/group/manager2/main/devicestate.c (original)
+++ team/group/manager2/main/devicestate.c Thu Mar 20 17:26:03 2008
@@ -402,8 +402,8 @@
 	struct ast_event *event;
 
 	if (!(event = ast_event_new(AST_EVENT_DEVICE_STATE,
-			AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, device,
-			AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_UINT, state,
+			AST_EVENT_IE_DEVICE, device,
+			AST_EVENT_IE_STATE, state,
 			AST_EVENT_IE_END))) {
 		return;
 	}

Modified: team/group/manager2/main/event.c
URL: http://svn.digium.com/view/asterisk/team/group/manager2/main/event.c?view=diff&rev=110376&r1=110375&r2=110376
==============================================================================
--- team/group/manager2/main/event.c (original)
+++ team/group/manager2/main/event.c Thu Mar 20 17:26:03 2008
@@ -271,8 +271,8 @@
 			continue;
 
 		event = ast_event_new(AST_EVENT_SUB,
-			AST_EVENT_IE_UNIQUEID,  AST_EVENT_IE_PLTYPE_UINT, sub->uniqueid,
-			AST_EVENT_IE_EVENTTYPE, AST_EVENT_IE_PLTYPE_UINT, sub->type,
+			AST_EVENT_IE_UNIQUEID, sub->uniqueid,
+			AST_EVENT_IE_EVENTTYPE, sub->type,
 			AST_EVENT_IE_END);
 
 		AST_LIST_TRAVERSE(&sub->ie_vals, ie_val, entry) {
@@ -350,8 +350,8 @@
 		struct ast_event_ie_val *ie_val;
 
 		event = ast_event_new(AST_EVENT_SUB,
-			AST_EVENT_IE_UNIQUEID,  AST_EVENT_IE_PLTYPE_UINT, sub->uniqueid,
-			AST_EVENT_IE_EVENTTYPE, AST_EVENT_IE_PLTYPE_UINT, sub->type,
+			AST_EVENT_IE_UNIQUEID, sub->uniqueid,
+			AST_EVENT_IE_EVENTTYPE, sub->type,
 			AST_EVENT_IE_END);
 
 		AST_LIST_TRAVERSE(&sub->ie_vals, ie_val, entry) {
@@ -404,8 +404,8 @@
 		AST_EVENT_IE_END) != AST_EVENT_SUB_NONE) {
 		
 		event = ast_event_new(AST_EVENT_UNSUB,
-			AST_EVENT_IE_UNIQUEID,  AST_EVENT_IE_PLTYPE_UINT, sub->uniqueid,
-			AST_EVENT_IE_EVENTTYPE, AST_EVENT_IE_PLTYPE_UINT, sub->type,
+			AST_EVENT_IE_UNIQUEID, sub->uniqueid,
+			AST_EVENT_IE_EVENTTYPE, sub->type,
 			AST_EVENT_IE_END);
 
 		if (event)
@@ -540,7 +540,7 @@
 		struct ast_event_ie_val *ie_val = alloca(sizeof(*ie_val));
 		memset(ie_val, 0, sizeof(*ie_val));
 		ie_val->ie_type = ie_type;
-		ie_val->ie_pltype = va_arg(ap, enum ast_event_ie_pltype);
+		ie_val->ie_pltype = ast_event_ie_get_pltype(ie_type);
 		if (ie_val->ie_pltype == AST_EVENT_IE_PLTYPE_UINT)
 			ie_val->payload.uint = va_arg(ap, uint32_t);
 		else if (ie_val->ie_pltype == AST_EVENT_IE_PLTYPE_STR)




More information about the svn-commits mailing list