kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 22:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

To keep others happy... revert part of my additions so trunk works.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-08-29 16:03:51 +00:00
parent d99440e2ed
commit c9445d4a68
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/event.h
View File

@@ -450,7 +450,7 @@ enum ast_event_ie_type ast_event_iterator_get_ie_type(struct ast_event_iterator
* *
* \return This returns the payload of the information element as a uint. * \return This returns the payload of the information element as a uint.
*/ */
uint32_t ast_event_iteragor_get_ie_uint(struct ast_event_iterator *iterator); uint32_t ast_event_iterator_get_ie_uint(struct ast_event_iterator *iterator);
/*! /*!
* \brief Get the value of the current IE in the iterator as a string payload * \brief Get the value of the current IE in the iterator as a string payload

20
main/event.c
View File

@@ -380,7 +380,7 @@ enum ast_event_ie_type ast_event_iterator_get_ie_type(struct ast_event_iterator
return iterator->ie->ie_type; return iterator->ie->ie_type;
} }
uint32_t ast_event_iteragor_get_ie_uint(struct ast_event_iterator *iterator) uint32_t ast_event_iterator_get_ie_uint(struct ast_event_iterator *iterator)
{ {
return ntohl(*iterator->ie->ie_payload); return ntohl(*iterator->ie->ie_payload);
} }
@@ -416,13 +416,19 @@ 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) const void *ast_event_get_ie_raw(const struct ast_event *event, enum ast_event_ie_type ie_type)
{ {
struct ast_event_iterator iterator; struct ast_event_ie *ie;
uint16_t event_len;
for (ast_event_iterator_init(&iterator, event); !ast_event_iterator_next(&iterator); ) {
if (ast_event_iterator_get_ie_type(&iterator) == ie_type) ie_type = ntohs(ie_type);
return ast_event_iterator_get_ie_raw(&iterator); 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;
} }
return NULL; return NULL;
} }