Changeset 244:341831610f7f in mediastreamer2

Timestamp:

Feb 7, 2009 9:51:56 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

new linphonec commands.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@247 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• console/commands.c (modified) (7 diffs)
• console/shell.c (modified) (4 diffs)
• coreapi/linphonecore.h (modified) (1 diff)
• coreapi/proxy.c (modified) (1 diff)

linphone/console/commands.c

@@ -60 +60 @@
 static int lpc_cmd_record(LinphoneCore *, char *);
 static int lpc_cmd_register(LinphoneCore *, char *);
+static int lpc_cmd_unregister(LinphoneCore *, char *);
 static int lpc_cmd_duration(LinphoneCore *lc, char *args);
 
@@ -68 +69 @@
 static void linphonec_proxy_remove(LinphoneCore *lc, int index);
 static  int linphonec_proxy_use(LinphoneCore *lc, int index);
+static void linphonec_proxy_show(LinphoneCore *lc,int index);
 static void linphonec_friend_display(LinphoneFriend *fr);
 static int linphonec_friend_list(LinphoneCore *lc, char *arg);
@@ -110 +112 @@
                 "'proxy use <index>' : use proxy with number index as default proxy.\n"
                 "'proxy unuse' : don't use a default proxy."
+                "'proxy show <index>' : show configuration and status of the proxy numbered by index.\n"
+                "'proxy show default' : show configuration and status of the default proxy.\n"
         },
         { "soundcard", lpc_cmd_soundcard, "Manage soundcards",
@@ -160 +164 @@
         { "quit", lpc_cmd_quit, "Exit linphonec", NULL },
         { "register", lpc_cmd_register, "Register in one line to a proxy" , "register <sip identity> <sip proxy> <password>"},
+        { "unregister", lpc_cmd_unregister, "Unregister from default proxy", NULL       },
         { "duration", lpc_cmd_duration, "Print duration in seconds of the last call.", NULL },
         { (char *)NULL, (lpc_cmd_handler)NULL, (char *)NULL, (char *)NULL }
@@ -634 +639 @@
                         else linphonec_out("Current default proxy is %d.\n", proxynum);
                 }
-        }
-        else if (strcmp(arg1, "unuse")==0)
-        {
+        }else if (strcmp(arg1, "unuse")==0){
                 linphone_core_set_default_proxy(lc, NULL);
                 linphonec_out("Use no proxy.\n");
-        }
-        else
+        }else if (strcmp(arg1,"show")==0){
+                if (arg2 && *arg2){
+                        if (strstr(arg2,"default")==0){
+                                proxynum=linphone_core_get_default_proxy(lc, NULL);
+                                linphonec_proxy_show(lc,proxynum);
+                        }else linphonec_proxy_show(lc,atoi(arg2));
+                }
+        }else
         {
                 linphonec_out("Syntax error - see 'help proxy'\n");
@@ -967 +976 @@
 linphonec_proxy_display(LinphoneProxyConfig *cfg)
 {
-        linphonec_out("sip address: %s\nroute: %s\nidentity: %s\nregister: %s\nexpires: %i\n",
+        linphonec_out("sip address: %s\nroute: %s\nidentity: %s\nregister: %s\nexpires: %i\nregistered: %s\n",
                         cfg->reg_proxy,
                         (cfg->reg_route!=NULL)?cfg->reg_route:"",
                         (cfg->reg_identity!=NULL)?cfg->reg_identity:"",
                         (cfg->reg_sendregister)?"yes":"no",
-                        cfg->expires);
+                        cfg->expires,
+                        linphone_proxy_config_is_registered(cfg) ? "yes" : "no");
+}
+
+static void linphonec_proxy_show(LinphoneCore *lc, int index){
+        const MSList *elem;
+        int i;
+        for(elem=linphone_core_get_proxy_config_list(lc),i=0;elem!=NULL;elem=elem->next,++i){
+                if (index==i){
+                        LinphoneProxyConfig *cfg=(LinphoneProxyConfig *)elem->data;
+                        linphonec_proxy_display(cfg);
+                        return;
+                }
+        }
+        linphonec_out("No proxy with index %i",index);
 }
 
@@ -1162 +1185 @@
 }
 
+static int lpc_cmd_unregister(LinphoneCore *lc, char *args){
+        LinphoneProxyConfig *cfg=NULL;
+        linphone_core_get_default_proxy(lc,&cfg);
+        if (cfg) {
+                linphone_proxy_config_edit(cfg);
+                linphone_proxy_config_enable_register(cfg,FALSE);
+                linphone_proxy_config_done(cfg);
+        }else{
+                linphonec_out("unregistered\n");
+        }
+        return 1;
+}
+
 int lpc_cmd_duration(LinphoneCore *lc, char *args){
         LinphoneCallLog *cl;

linphone/console/shell.c

@@ -171 +171 @@
 }
 
+static int unregister_execute(int argc, char *argv[]){
+        return send_generic_command("unregister",FALSE);
+}
+
+
 static int dial_execute(int argc, char *argv[]){
         char cmd[512];
@@ -181 +186 @@
         return -1;
 }
+
+static int status_execute(int argc, char *argv[]){
+        char cmd[512];
+        if (argc==1){
+                snprintf(cmd,sizeof(cmd),"call %s",argv[0]);
+                return send_generic_command(cmd,TRUE);
+        }else{
+                print_usage();
+        }
+        return -1;
+}
+
 int main(int argc, char *argv[]){
         int argi;
@@ -202 +219 @@
                 }else if (strcmp(argv[argi],"register")==0){
                         return register_execute(argc-argi-1,&argv[argi+1]);
+                }else if (strcmp(argv[argi],"unregister")==0){
+                        return unregister_execute(argc-argi-1,&argv[argi+1]);
                 }else if (strcmp(argv[argi],"dial")==0){
                         return dial_execute(argc-argi-1,&argv[argi+1]);
@@ -207 +226 @@
                         send_generic_command("terminate",FALSE);
                         send_generic_command("duration",TRUE);
+                }else if (strcmp(argv[argi],"status")==0){
+                        return status_execute(argc-argi-1,&argv[argi+1]);
                 }
         }

linphone/coreapi/linphonecore.h

@@ -305 +305 @@
 int linphone_proxy_config_done(LinphoneProxyConfig *obj);
 void linphone_proxy_config_enable_publish(LinphoneProxyConfig *obj, bool_t val);
+bool_t linphone_proxy_config_is_registered(const LinphoneProxyConfig *obj);
 #define linphone_proxy_config_get_route(obj)  ((obj)->reg_route)
 #define linphone_proxy_config_get_identity(obj) ((obj)->reg_identity)

linphone/coreapi/proxy.c

@@ -47 +47 @@
 }
 
+bool_t linphone_proxy_config_is_registered(const LinphoneProxyConfig *obj){
+        return obj->registered;
+}
+
 static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
         osip_message_t *msg;