From e311ae98d1405e2b39f45f78e700999a5842e67b Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 29 Aug 2007 16:25:30 +0000 Subject: Return ast_event_get_ie_raw to using an iterator and fix logic in ast_event_iterator_next. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81348 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/event.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'main/event.c') diff --git a/main/event.c b/main/event.c index a905f6330..562e1f3bd 100644 --- a/main/event.c +++ b/main/event.c @@ -372,7 +372,7 @@ void ast_event_iterator_init(struct ast_event_iterator *iterator, const struct a int ast_event_iterator_next(struct ast_event_iterator *iterator) { iterator->ie = ((void *) iterator->ie) + sizeof(*iterator->ie) + ntohs(iterator->ie->ie_payload_len); - return ((iterator->event_len > (((void *) iterator->ie) - ((void *) iterator->event))) ? -1 : 0); + return ((iterator->event_len < (((void *) iterator->ie) - ((void *) iterator->event))) ? -1 : 0); } enum ast_event_ie_type ast_event_iterator_get_ie_type(struct ast_event_iterator *iterator) @@ -416,20 +416,16 @@ const char *ast_event_get_ie_str(const struct ast_event *event, enum ast_event_i const void *ast_event_get_ie_raw(const struct ast_event *event, enum ast_event_ie_type ie_type) { - struct ast_event_ie *ie; - uint16_t event_len; - + struct ast_event_iterator iterator; + int res = 0; + ie_type = ntohs(ie_type); - event_len = ntohs(event->event_len); - - ie = ((void *) event) + sizeof(*event); - - while ((((void *) ie) - ((void *) event)) < event_len) { - if (ie->ie_type == ie_type) - return ie->ie_payload; - ie = ((void *) ie) + sizeof(*ie) + ntohs(ie->ie_payload_len); + + for (ast_event_iterator_init(&iterator, event); !res; res = ast_event_iterator_next(&iterator)) { + if (ast_event_iterator_get_ie_type(&iterator) == ie_type) + return ast_event_iterator_get_ie_raw(&iterator); } - + return NULL; } -- cgit v1.2.3