Modifications after code review. Pulled changes outs of ecallmgr_fs_x…

…ml.erl and placed the new originate headers into to the SPECIAL_CHANNEL_VARS in ecallmgr.hrl Made modifications to remove the freeswitch leaky abstractions into kazo
snelgoedkoop · Sep 11, 2013 · b5440d6 · b5440d6
1 parent 1db81cd
commit b5440d6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/applications/ecallmgr/src/ecallmgr.hrl b/applications/ecallmgr/src/ecallmgr.hrl
@@ -202,6 +202,8 @@
                                ,{<<"Enable-T38-Fax">>, <<"fax_enable_t38">>}
                                ,{<<"Enable-T38-Fax-Request">>, <<"fax_enable_t38_request">>}
                                ,{<<"Enable-T38-Passthrough">>, <<"t38_passthru">>}
+                               ,{<<"Fax-Identity-Number">>, <<"fax_ident">>}
+                               ,{<<"Fax-Identity-Name">>, <<"fax_header">>}
                                ,{<<"sip_rh_X-Redirect-Server">>, <<"sip_rh_X-Redirect-Server">>}
                                ,{<<"park_after_bridge">>, <<"park_after_bridge">>}
                                ,{<<"continue_on_fail">>, <<"continue_on_fail">>}

diff --git a/applications/ecallmgr/src/ecallmgr_fs_xml.erl b/applications/ecallmgr/src/ecallmgr_fs_xml.erl
@@ -1,3 +1,4 @@
+
 %%%-------------------------------------------------------------------
 %%% @copyright (C) 2011-2013, 2600Hz INC
 %%% @doc
@@ -332,19 +333,6 @@ get_channel_vars({<<"SIP-Headers">>, SIPJObj}, Vars) ->
     lists:foldl(fun({K,V}, Vars0) ->
                         [ list_to_binary(["sip_h_", K, "=", V]) | Vars0]
                 end, Vars, SIPHeaders);
-
-get_channel_vars({<<"Fax-Ident">>, FaxIdent}, Vars) ->
-    [ list_to_binary(["fax_ident='"
-                      ,wh_util:to_list(FaxIdent)
-                      ,"'"]) 
-      | Vars
-    ];
-get_channel_vars({<<"Fax-Header">>, FaxHeader}, Vars) ->
-    [ list_to_binary(["fax_header='"
-                      ,wh_util:to_list(FaxHeader)
-                      ,"'"]) 
-      | Vars
-    ];
 get_channel_vars({<<"To-User">>, Username}, Vars) ->
     [list_to_binary([?CHANNEL_VAR_PREFIX, "Username"
                      ,"='", wh_util:to_list(Username), "'"])

diff --git a/applications/fax/src/fax_worker.erl b/applications/fax/src/fax_worker.erl
@@ -501,8 +501,8 @@ send_fax(JobId, JObj, Q) ->
                ,{<<"Outbound-Caller-ID-Number">>, wh_json:get_value(<<"from_number">>, JObj)}
                ,{<<"Account-ID">>, wh_json:get_value(<<"pvt_account_id">>, JObj)}
                ,{<<"To-DID">>, wnm_util:to_e164(wh_json:get_value(<<"to_number">>, JObj))}
-               ,{<<"Fax-Ident">>, wh_json:get_value(<<"fax_ident">>, JObj)}
-               ,{<<"Fax-Header">>, wh_json:get_value(<<"fax_header">>, JObj)}
+               ,{<<"Fax-Identitiy-Number">>, wh_json:get_value(<<"fax_identity_number">>, JObj)}
+               ,{<<"Fax-Identity-Name">>, wh_json:get_value(<<"fax_identity_name">>, JObj)}
                ,{<<"Resource-Type">>, <<"originate">>}
                ,{<<"Msg-ID">>, JobId}
                ,{<<"Ignore-Early-Media">>, IgnoreEarlyMedia}

diff --git a/applications/stepswitch/src/stepswitch_outbound.erl b/applications/stepswitch/src/stepswitch_outbound.erl
@@ -267,8 +267,8 @@ originate_to_endpoints(Endpoints, JObj) ->
                  ,{<<"Outbound-Caller-ID-Name">>, CIDName}
                  ,{<<"Outbound-Callee-ID-Number">>, CalleeIdNumber}
                  ,{<<"Outbound-Callee-ID-Name">>, CalleeIdName}
-                 ,{<<"Fax-Ident">>, wh_json:get_value(<<"Fax-Ident">>, JObj)}
-                 ,{<<"Fax-Header">>, wh_json:get_value(<<"Fax-Header">>, JObj)}
+                 ,{<<"Fax-Identity-Number">>, wh_json:get_value(<<"Fax-Identity-Number">>, JObj, CIDNum)}
+                 ,{<<"Fax-Identity-Name">>, wh_json:get_value(<<"Fax-Identity-Name">>, JObj, CIDName)}
                  ,{<<"Caller-ID-Number">>, CIDNum}
                  ,{<<"Caller-ID-Name">>, CIDName}
                  ,{<<"Ringback">>, wh_json:get_value(<<"Ringback">>, JObj)}

diff --git a/core/whistle-1.0.0/src/api/wapi_offnet_resource.erl b/core/whistle-1.0.0/src/api/wapi_offnet_resource.erl
@@ -32,7 +32,7 @@
               ,<<"Control-Queue">>, <<"Call-ID">>, <<"Application-Data">>
               ,<<"Account-ID">>, <<"Outbound-Call-ID">>
               ,<<"Call-ID">>, <<"Mode">>, <<"Group-ID">> % Eavesdrop
-              ,<<"Force-Outbound">>, <<"Fax-Ident">>, <<"Fax-Header">>
+              ,<<"Force-Outbound">>, <<"Fax-Identity-Number">>, <<"Fax-Identity-Name">>
               ,<<"Enable-T38-Fax">>, <<"Enable-T38-Fax-Request">>
               ,<<"Enable-T38-Passthrough">>, <<"Force-Fax">>, <<"Enable-T38-Gateway">>
          ]).

diff --git a/core/whistle-1.0.0/src/api/wapi_resource.erl b/core/whistle-1.0.0/src/api/wapi_resource.erl
@@ -75,8 +75,8 @@
                                              ,<<"Eavesdrop-Call-ID">>
                                              ,<<"Eavesdrop-Mode">>
                                              ,<<"Eavesdrop-Group-ID">>
-                                             ,<<"Fax-Ident">>
-                                             ,<<"Fax-Header">>
+                                             ,<<"Fax-Identity-Number">>
+                                             ,<<"Fax-Identity-Name">>
                                          | fun() ->
                                                    wapi_dialplan:optional_bridge_req_headers()
                                            end()