mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	res/ari: Add the Asterisk EID field to outgoing events
This patch adds the Asterisk EID field to all outgoing ARI events. Because this field should be added to all events as they are transmitted, it is appended to the JSON message just prior to it being handed off to the application message handler. This makes it somewhat resilient to both new events being added to ARI, as well as other potential event transport mechanisms. ASTERISK-26470 #close Change-Id: Ieff0ecc24464e83f3f44e9c3e7bd9a5d70b87a1d
This commit is contained in:
		
				
					committed by
					
						 George Joseph
						George Joseph
					
				
			
			
				
	
			
			
			
						parent
						
							5df575e16a
						
					
				
				
					commit
					dd5129d84a
				
			| @@ -1486,10 +1486,12 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - new_messages: int (required) | ||||
|  * - old_messages: int (required) | ||||
|  * ApplicationReplaced | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * BridgeAttendedTransfer | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1510,6 +1512,7 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - transferer_second_leg: Channel (required) | ||||
|  * - transferer_second_leg_bridge: Bridge | ||||
|  * BridgeBlindTransfer | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1522,22 +1525,26 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - result: string (required) | ||||
|  * - transferee: Channel | ||||
|  * BridgeCreated | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - bridge: Bridge (required) | ||||
|  * BridgeDestroyed | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - bridge: Bridge (required) | ||||
|  * BridgeMerged | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - bridge: Bridge (required) | ||||
|  * - bridge_from: Bridge (required) | ||||
|  * ChannelCallerId | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1545,16 +1552,19 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - caller_presentation_txt: string (required) | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelConnectedLine | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelCreated | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelDestroyed | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1562,6 +1572,7 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - cause_txt: string (required) | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelDialplan | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1569,6 +1580,7 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - dialplan_app: string (required) | ||||
|  * - dialplan_app_data: string (required) | ||||
|  * ChannelDtmfReceived | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1576,12 +1588,14 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - digit: string (required) | ||||
|  * - duration_ms: int (required) | ||||
|  * ChannelEnteredBridge | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - bridge: Bridge (required) | ||||
|  * - channel: Channel | ||||
|  * ChannelHangupRequest | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1589,39 +1603,46 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - channel: Channel (required) | ||||
|  * - soft: boolean | ||||
|  * ChannelHold | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * - musicclass: string | ||||
|  * ChannelLeftBridge | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - bridge: Bridge (required) | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelStateChange | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelTalkingFinished | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * - duration: int (required) | ||||
|  * ChannelTalkingStarted | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelUnhold | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * ChannelUserevent | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1631,6 +1652,7 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - eventname: string (required) | ||||
|  * - userevent: object (required) | ||||
|  * ChannelVarset | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1643,17 +1665,20 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - roundtrip_usec: string | ||||
|  * - uri: string (required) | ||||
|  * ContactStatusChange | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - contact_info: ContactInfo (required) | ||||
|  * - endpoint: Endpoint (required) | ||||
|  * DeviceStateChanged | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - device_state: DeviceState (required) | ||||
|  * Dial | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1664,17 +1689,21 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - forwarded: Channel | ||||
|  * - peer: Channel (required) | ||||
|  * EndpointStateChange | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - endpoint: Endpoint (required) | ||||
|  * Event | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * Message | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * MissingParams | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - params: List[string] (required) | ||||
|  * Peer | ||||
| @@ -1684,6 +1713,7 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - port: string | ||||
|  * - time: string | ||||
|  * PeerStatusChange | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1695,36 +1725,43 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - timestamp: Date | ||||
|  * - playback: Playback (required) | ||||
|  * PlaybackFinished | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - playback: Playback (required) | ||||
|  * PlaybackStarted | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - playback: Playback (required) | ||||
|  * RecordingFailed | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - recording: LiveRecording (required) | ||||
|  * RecordingFinished | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - recording: LiveRecording (required) | ||||
|  * RecordingStarted | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - recording: LiveRecording (required) | ||||
|  * StasisEnd | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|  * - channel: Channel (required) | ||||
|  * StasisStart | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
| @@ -1732,6 +1769,7 @@ ari_validator ast_ari_validate_application_fn(void); | ||||
|  * - channel: Channel (required) | ||||
|  * - replace_channel: Channel | ||||
|  * TextMessageReceived | ||||
|  * - asterisk_id: string | ||||
|  * - type: string (required) | ||||
|  * - application: string (required) | ||||
|  * - timestamp: Date | ||||
|   | ||||
		Reference in New Issue
	
	Block a user