mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Merged revisions 295710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r295710 | russell | 2010-11-19 18:45:51 -0600 (Fri, 19 Nov 2010) | 29 lines Fix cache of device state changes for multiple servers. This patch addresses a regression where device states across multiple servers were not being processing completely correctly. The code works to determine the overall state by looking at the last known state of a device on each server. However, there was a regression due to some invasive rewrites of how the cache works that led to the cache only storing the last device state change for a device, regardless of which server it was on. The code is set up to cache device state change events by ensuring that each event in the cache has a unique device name + entity ID (server ID). The code that was responsible for comparing raw information elements (which EID is) always returned a match due to a memcmp() with a length of 0. There isn't much code to fix the actual bug. This patch also introduces a new CLI command that was very useful for debugging this problem. The command allows you to dump the contents of the event cache. (closes issue #18284) Reported by: klaus3000 Patches: issue18284.rev1.txt uploaded by russell (license 2) Tested by: russell, klaus3000 (closes issue #18280) Reported by: klaus3000 Review: https://reviewboard.asterisk.org/r/1012/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@295711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -583,6 +583,17 @@ uint32_t ast_event_get_ie_str_hash(const struct ast_event *event, enum ast_event | ||||
|  */ | ||||
| const void *ast_event_get_ie_raw(const struct ast_event *event, enum ast_event_ie_type ie_type); | ||||
|  | ||||
| /*! | ||||
|  * \brief Get the length of the raw payload for a particular IE | ||||
|  * | ||||
|  * \param event The event to get the IE payload length from | ||||
|  * \param ie_type the type of information element to get the length of | ||||
|  * | ||||
|  * \return If an IE of type ie_type is found, its payload length is returned. | ||||
|  *         Otherwise, 0 is returned. | ||||
|  */ | ||||
| uint16_t ast_event_get_ie_raw_payload_len(const struct ast_event *event, enum ast_event_ie_type ie_type); | ||||
|  | ||||
| /*! | ||||
|  * \brief Get the string representation of an information element type | ||||
|  * | ||||
| @@ -724,6 +735,15 @@ const char *ast_event_iterator_get_ie_str(struct ast_event_iterator *iterator); | ||||
|  */ | ||||
| void *ast_event_iterator_get_ie_raw(struct ast_event_iterator *iterator); | ||||
|  | ||||
| /*! | ||||
|  * \brief Get the length of the raw payload for the current IE for an iterator | ||||
|  * | ||||
|  * \param iterator The IE iterator | ||||
|  * | ||||
|  * \return The payload length of the current IE | ||||
|  */ | ||||
| uint16_t ast_event_iterator_get_ie_raw_payload_len(struct ast_event_iterator *iterator); | ||||
|  | ||||
| #if defined(__cplusplus) || defined(c_plusplus) | ||||
| } | ||||
| #endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user