Merge pull request #57 from voxter/PISTON-46-bug-konami-peer-both

PISTON-46: resolved issue
voxter · Jun 12, 2015 · b70785e · b70785e
2 parents eaf1c62 + a15c195
commit b70785e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/applications/ecallmgr/src/ecallmgr_call_events.erl b/applications/ecallmgr/src/ecallmgr_call_events.erl
@@ -607,6 +607,7 @@ generic_call_event_props(Props) ->
      ,{<<"Hangup-Cause">>, get_hangup_cause(Props)}
      ,{<<"Hangup-Code">>, get_hangup_code(Props)}
      ,{<<"Disposition">>, get_disposition(Props)}
+     ,{<<"Endpoint-Disposition">>, props:get_value(<<"variable_endpoint_disposition">>, Props)}
      ,{<<"Raw-Application-Name">>, get_raw_application_name(Props)}
      ,{<<"Channel-Moving">>, get_channel_moving(Props)}
      ,{<<"Call-Direction">>, props:get_value(<<"Call-Direction">>, Props)}

diff --git a/applications/konami/src/konami_code_fsm.erl b/applications/konami/src/konami_code_fsm.erl
@@ -228,7 +228,17 @@ handle_event(?EVENT(CallId, <<"CHANNEL_BRIDGE">>, Evt)
              ,StateName
              ,#state{call_id=CallId}=State
             ) ->
-    {'next_state', StateName, handle_channel_bridge(State, CallId, kz_call_event:other_leg_call_id(Evt))};
+    case wh_json:get_value(<<"Endpoint-Disposition">>, Evt) of
+        <<"EARLY MEDIA">> ->
+            lager:debug("we'll let that one slide... (early media should be treated like an answer)"),
+            OtherLegCallId = kz_call_event:other_leg_call_id(Evt),
+            maybe_add_call_event_bindings(OtherLegCallId),
+            {'next_state'
+             ,StateName
+             ,handle_channel_bridge(State#state{other_leg=OtherLegCallId}, CallId, OtherLegCallId)
+            };
+        _ -> {'next_state', StateName, handle_channel_bridge(State, CallId, kz_call_event:other_leg_call_id(Evt))}
+    end;
 handle_event(?EVENT(OtherLeg, <<"CHANNEL_BRIDGE">>, Evt)
              ,StateName
              ,#state{other_leg=OtherLeg}=State

diff --git a/core/whistle-1.0.0/src/api/wapi_call.erl b/core/whistle-1.0.0/src/api/wapi_call.erl
@@ -78,7 +78,7 @@
                                       ,<<"Other-Leg-Call-ID">> %% BRIDGE
                                       ,<<"Target-Call-ID">> %% TRANSFEREE
                                       ,<<"Detected-Tone">>, <<"DTMF-Duration">>, <<"DTMF-Digit">> %% DTMF and Tones
-                                      ,<<"Terminator">>, <<"Disposition">>
+                                      ,<<"Terminator">>, <<"Disposition">>, <<"Endpoint-Disposition">>
                                       ,<<"Hangup-Cause">>, <<"Hangup-Code">> %% Hangup
                                       ,<<"Raw-Application-Name">>, <<"Raw-Application-Data">>
                                       ,<<"Length">>, <<"Silence-Terminated">> %% Record-related