From 0208ffa7e70d664199a87f9fd6f0bd9ad8117a70 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Mon, 11 Feb 2008 02:47:25 +0000 Subject: Fix a problem regarding network vs. host byte order in the event API. ast_event_iterator_get_ie_type should return the ie type in host byte order. Furthermore, ast_event_get_ie_raw should already have its ie type argument in host byte order since it could be called externally (and it in fact is called in this way by ast_event_get_cached). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103282 f38db490-d61c-443f-a65b-d21fe96a405b --- main/event.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'main') diff --git a/main/event.c b/main/event.c index 333b628a1..705063b82 100644 --- a/main/event.c +++ b/main/event.c @@ -388,7 +388,7 @@ int ast_event_iterator_next(struct ast_event_iterator *iterator) enum ast_event_ie_type ast_event_iterator_get_ie_type(struct ast_event_iterator *iterator) { - return iterator->ie->ie_type; + return ntohs(iterator->ie->ie_type); } uint32_t ast_event_iterator_get_ie_uint(struct ast_event_iterator *iterator) @@ -430,8 +430,6 @@ const void *ast_event_get_ie_raw(const struct ast_event *event, enum ast_event_i struct ast_event_iterator iterator; int res = 0; - ie_type = ntohs(ie_type); - 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); -- cgit v1.2.3