Minor updates

zfjia · Jul 10, 2014 · 87e6c77 · 87e6c77
1 parent 32a9b83
commit 87e6c77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/samples/nksip_tutorial/src/nksip_tutorial.erl b/samples/nksip_tutorial/src/nksip_tutorial.erl
@@ -79,8 +79,8 @@ launch() ->
 
     {ok,200,[{dialog_id, DlgId}]}= 
         nksip_uac:invite(client2, "sip:client1@nksip", 
-                        [{route, "<sips:127.0.0.1;lr>"}, {body, nksip_sdp:new()}]),
-    ok = nksip_uac:ack(DlgId, []),
+                        [{route, "<sips:127.0.0.1;lr>"}, {body, nksip_sdp:new()},
+                          auto_2xx_ack]),
 
     confirmed = nksip_dialog:meta(invite_status, DlgId),
     [_, _, _] = nksip_dialog:get_all_data(),

diff --git a/src/nksip_uac_lib.erl b/src/nksip_uac_lib.erl
@@ -397,10 +397,6 @@ parse_opts([Term|Rest], Req, Opts) ->
             {update, Req, [{reg_id, RegId}|Opts]};
         {reg_id, _} ->
             error;
-        % {refer_subscription_id, Refer} when is_binary(Refer) ->
-        %     {update, Req, [{refer_subscription_id, Refer}|Opts]};
-        % {refer_subscription_id, _} ->
-        %     error;
 
         %% Automatic header generation (replace existing headers)
         user_agent ->
@@ -434,23 +430,6 @@ parse_opts([Term|Rest], Req, Opts) ->
         unregister ->
             {retry, [contact, {expires, 0}|Rest]};
 
-        % % Timer options
-        % {min_se, SE} when is_binary(SE); is_integer(SE) ->
-        %     {replace, <<"min-se">>, SE};
-        % {session_expires, SE} when is_integer(SE) ->
-        %     {retry, [{session_expires, {SE, undefined}}|Rest]};
-        % {session_expires, {SE, Refresh}} when is_integer(SE) ->
-        %     case AppId:config_nksip_timers() of
-        %         {_, MinSE} when SE<MinSE -> 
-        %             throw({invalid_config, session_expires});
-        %         _ when Refresh==undefined -> 
-        %             {replace, <<"session-expires">>, SE};
-        %         _ when Refresh==uac; Refresh==uas -> 
-        %             {replace, <<"session-expires">>, {SE, [{<<"refresher">>, Refresh}]}};
-        %         _ ->
-        %             throw({invalid_config, session_expires})
-        %     end;
-
         % Event options
         {subscription_state, ST} when Method=='NOTIFY'->
             Value = case ST of