Re: [Linphone-users] Proxy usage in linphone1.0pre

[James Sapara]

Erich Schubert wrote:

> How do I configure the proxy/registrar settings correctly in my
> linphone?
>
>  
Erich,

Attached is a patch that should allow you too use proxy-require setting 
in linphone. We've submitted it as a patch too the project as well, but 
not sure when or if it will be integrated.

James

--
-----------------------------------------------------------------------
James Sapara
Software Architect

Echoblast Interactive Inc       Tel: 306.653.2725 x14
Suite 300, Scotia Center        Toll Free: 1.800.521.4510
111 Second Ave South            Fax: 306.653.0972
Saskatoon, SK S7K 1K6
Canada
http://www.echoblast.com        address@hidden
-----------------------------------------------------------------------

--- ./osipua/src/regctxt.h      2004-12-08 13:51:29.000000000 -0600
+++ ./osipua/src/regctxt.h.original     2004-12-08 13:48:25.000000000 -0600
@@ -28,7 +28,6 @@
        char *password;
         int cseq_number;
         char *callid_number;
-        char *proxy_require;
        int expires;
        int action;     /* perhaps deprecated ...*/
 #define REGISTER_ACTION_PROXY 0
@@ -45,7 +44,6 @@
 void registration_ctxt_set_address_of_record(RegistrationCtxt *ctxt, char 
*addr_of_rec);
 #define registration_ctxt_set_expires(r,e)     (r)->expires=(e)
 #define registration_ctxt_set_action(r,a)      (r)->action=(a)
-void registration_ctxt_set_proxy_require(RegistrationCtxt *ctxt, char 
*proxy_req);
 void registration_ctxt_destroy( RegistrationCtxt *ctx);
 
 /* PRIVATE: */
--- ./osipua/src/osipdialog.c   2004-12-08 16:46:35.000000000 -0600
+++ ./osipua/src/osipdialog.c.original  2004-12-07 15:55:22.000000000 -0600
@@ -1739,10 +1739,6 @@
                /* add the expire header == 0 or == expire */
                sprintf (exp, "%i", context->expires);
                msg_setexpires (request, exp);
-                if (NULL != context->proxy_require)
-                {
-                        msg_setproxy_require (request, context->proxy_require);
-                }
        }
        else if (0 == strcmp ("INFO", method_name))
        {
--- ./osipua/src/regctxt.c      2004-12-08 13:58:03.000000000 -0600
+++ ./osipua/src/regctxt.c.original     2004-12-08 13:51:44.000000000 -0600
@@ -87,24 +87,6 @@
        }
        ctxt->address_of_record=sgetcopy(addr_of_rec);
 }
-/**
- * registration_ctxt_set_proxy_require:
- * @ctxt: a RegistrationCtxt object.
- * @proxy_req: the Proxy-Require value used during registration.
- *
- * Sets the Proxy-Require value to be used during registration. If NULL, this 
header
- * will not be sent.
- *
- */
-void registration_ctxt_set_proxy_require(RegistrationCtxt *ctxt, char 
*proxy_req)
-{
-       if ( ctxt->proxy_require!=NULL) sfree(ctxt->proxy_require);
-       if (proxy_req==NULL) {
-               ctxt->proxy_require=NULL;
-               return;
-       }
-       ctxt->proxy_require=sgetcopy(proxy_req);
-}
 
 #if 0
 RegistrationCtxt * registration_ctxt_dup(  RegistrationCtxt *ctxt)
--- ./coreapi/linphonecore.h    2004-12-08 18:53:14.000000000 -0600
+++ ./coreapi/linphonecore.h.original   2004-12-08 18:43:26.000000000 -0600
@@ -75,7 +75,6 @@
        char *registrar;        /*or proxy */
        char *passwd;
        char *addr_of_rec;
-       char *proxy_req;
        guint expires;
        GTimer *timer;
        guint32 use_registrar:1;                /* general flag */
@@ -311,10 +310,6 @@
 
 int linphone_core_set_registrar_addr(LinphoneCore *lc, char 
*url,char*addr_of_rec);
 
-char *linphone_core_get_proxy_req(LinphoneCore *lc);
-
-void linphone_core_set_proxy_req(LinphoneCore *lc, gchar *proxy_req);
-
 int linphone_core_register(LinphoneCore *lc, char *url);
 
 void linphone_core_get_registrar_usage(LinphoneCore *lc, gboolean *enabled, 
gboolean *as_proxy, gint*expires);
--- ./coreapi/linphonecore.c    2004-12-09 12:28:18.000000000 -0600
+++ ./coreapi/linphonecore.c.original   2004-12-08 18:45:38.000000000 -0600
@@ -417,9 +417,6 @@
        tmpstr=gnome_config_get_string_with_default("sip/passwd",&def);
        if (def) tmpstr=NULL;
        linphone_core_set_registrar_passwd(lc,tmpstr);
-       tmpstr=gnome_config_get_string_with_default("sip/proxy_req",&def);
-       if (def) tmpstr=NULL;
-       linphone_core_set_proxy_req(lc,tmpstr);
        tmp1=gnome_config_get_int_with_default("sip/use_registrar",&def);
        if (def) tmp1=0;
        tmp2=gnome_config_get_int_with_default("sip/as_proxy",&def);
@@ -794,23 +791,6 @@
        lc->sip_conf.reg_conf.passwd=tmp;
 }
 
-char *linphone_core_get_proxy_req(LinphoneCore *lc)
-{
-       return g_strdup(lc->sip_conf.reg_conf.proxy_req);
-}
-
-void linphone_core_set_proxy_req(LinphoneCore *lc, gchar *proxy_req)
-{
-       gchar *tmp=NULL;
-       if (proxy_req!=NULL){
-               tmp=g_strdup(proxy_req);
-       }
-       if (lc->sip_conf.reg_conf.proxy_req!=NULL){
-               g_free(lc->sip_conf.reg_conf.proxy_req);
-       }
-       lc->sip_conf.reg_conf.proxy_req=tmp;
-}
-
 
 int linphone_core_register(LinphoneCore *lc, char *url){
        if (url!=NULL){
--- ./coreapi/misc.c    2004-12-08 18:35:11.000000000 -0600
+++ ./coreapi/misc.c.original   2004-12-08 18:33:19.000000000 -0600
@@ -249,7 +249,6 @@
                regctx=registration_ctxt_new();         
                
registration_ctxt_set_registrar(regctx,lc->sip_conf.reg_conf.registrar);
                registration_ctxt_set_password(regctx, 
lc->sip_conf.reg_conf.passwd);
-               registration_ctxt_set_proxy_require(regctx, 
lc->sip_conf.reg_conf.proxy_req);
                registration_ctxt_set_address_of_record(regctx, 
lc->sip_conf.reg_conf.addr_of_rec);
                if (doit) {
                        lc->vtable.display_status(lc,_("Registering..."));