another few errno.h removals
[asterisk/asterisk.git] / channels / iax2-provision.c
index 990c0f0..5a06a8f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
  * \author Mark Spencer <markster@digium.com>
  */
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/socket.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
@@ -46,14 +41,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/md5.h"
 #include "asterisk/astdb.h"
 #include "asterisk/utils.h"
+#include "asterisk/acl.h"
 #include "iax2.h"
 #include "iax2-provision.h"
 #include "iax2-parser.h"
 
-#ifndef IPTOS_MINCOST
-#define IPTOS_MINCOST 0x02
-#endif
-
 static int provinit = 0;
 
 struct iax_template {
@@ -70,7 +62,7 @@ struct iax_template {
        unsigned int altserver;
        unsigned int flags;
        unsigned int format;
-       int tos;        
+       unsigned int tos;       
 } *templates;
 
 static struct iax_flag {
@@ -90,20 +82,24 @@ static struct iax_flag {
 char *iax_provflags2str(char *buf, int buflen, unsigned int flags)
 {
        int x;
-       if (!buf || buflen < 1) {
-               return(NULL);
-       }
+
+       if (!buf || buflen < 1)
+               return NULL;
+       
        buf[0] = '\0';
-       for (x=0;x<sizeof(iax_flags) / sizeof(iax_flags[0]); x++) {
+
+       for (x = 0; x < sizeof(iax_flags) / sizeof(iax_flags[0]); x++) {
                if (flags & iax_flags[x].value){
                        strncat(buf, iax_flags[x].name, buflen - strlen(buf) - 1);
                        strncat(buf, ",", buflen - strlen(buf) - 1);
                }
        }
-       if (strlen(buf)) 
+
+       if (!ast_strlen_zero(buf)) 
                buf[strlen(buf) - 1] = '\0';
        else
                strncpy(buf, "none", buflen - 1);
+
        return buf;
 }
 
@@ -161,17 +157,16 @@ char *iax_prov_complete_template(const char *line, const char *word, int pos, in
        char *ret = NULL;
        int wordlen = strlen(word);
 
-       ast_mutex_lock(&provlock);
-       for (c = templates; c; c = c->next) {
-               if (!strncasecmp(word, c->name, wordlen)) {
-                       if (++which > state) {
-                               ret = strdup(c->name);
+       if (pos == 3) {
+               ast_mutex_lock(&provlock);
+               for (c = templates; c; c = c->next) {
+                       if (!strncasecmp(word, c->name, wordlen) && ++which > state) {
+                               ret = ast_strdup(c->name);
                                break;
                        }
                }
+               ast_mutex_unlock(&provlock);
        }
-       ast_mutex_unlock(&provlock);
-       
        return ret;
 }
 
@@ -247,16 +242,16 @@ int iax_provision_version(unsigned int *version, const char *template, int force
                if (strcmp(tmp, "u")) {
                        ret = iax_provision_build(&ied, version, template, force);
                        if (ret)
-                               ast_log(LOG_DEBUG, "Unable to create provisioning packet for '%s'\n", template);
+                               ast_debug(1, "Unable to create provisioning packet for '%s'\n", template);
                } else
                        ret = -1;
-       } else if (option_debug)
-               ast_log(LOG_DEBUG, "Retrieved cached version '%s' = '%08x'\n", tmp, *version);
+       } else
+               ast_debug(1, "Retrieved cached version '%s' = '%08x'\n", tmp, *version);
        ast_mutex_unlock(&provlock);
        return ret;
 }
 
-static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, char *s, char *def)
+static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, const char *s, const char *def)
 {
        struct ast_variable *v;
        int foundportno = 0;
@@ -266,7 +261,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
        struct hostent *hp;
        struct ast_hostent h;
        struct iax_template *src, tmp;
-       char *t;
+       const char *t;
        if (def) {
                t = ast_variable_retrieve(cfg, s ,"template");
                src = NULL;
@@ -280,7 +275,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
                if (!src) {
                        src = iax_template_find(def, 0);
                        if (!src)
-                               ast_log(LOG_WARNING, "Unable to locate default base template '%s' for creating '%s', omitting.", def, s);
+                               ast_log(LOG_WARNING, "Unable to locate default base template '%s' for creating '%s', omitting.\n", def, s);
                }
                if (!src)
                        return -1;
@@ -328,20 +323,8 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
                        } else
                                ast_log(LOG_WARNING, "Ignoring invalid codec '%s' for '%s' at line %d\n", v->value, s, v->lineno);
                } else if (!strcasecmp(v->name, "tos")) {
-                       if (sscanf(v->value, "%d", &x) == 1)
-                               cur->tos = x & 0xff;
-                       else if (!strcasecmp(v->value, "lowdelay"))
-                               cur->tos = IPTOS_LOWDELAY;
-                       else if (!strcasecmp(v->value, "throughput"))
-                               cur->tos = IPTOS_THROUGHPUT;
-                       else if (!strcasecmp(v->value, "reliability"))
-                               cur->tos = IPTOS_RELIABILITY;
-                       else if (!strcasecmp(v->value, "mincost"))
-                               cur->tos = IPTOS_MINCOST;
-                       else if (!strcasecmp(v->value, "none"))
-                               cur->tos = 0;
-                       else
-                               ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno);
+                       if (ast_str2tos(v->value, &cur->tos))
+                               ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/qos.tex for more information.\n", v->lineno);
                } else if (!strcasecmp(v->name, "user")) {
                        strncpy(cur->user, v->value, sizeof(cur->user) - 1);
                        if (strcmp(cur->user, v->value))
@@ -385,13 +368,12 @@ static int iax_process_template(struct ast_config *cfg, char *s, char *def)
        }
        if (!cur) {
                mallocd = 1;
-               cur = malloc(sizeof(struct iax_template));
+               cur = ast_calloc(1, sizeof(*cur));
                if (!cur) {
                        ast_log(LOG_WARNING, "Out of memory!\n");
                        return -1;
                }
                /* Initialize entry */
-               memset(cur, 0, sizeof(*cur));
                strncpy(cur->name, s, sizeof(cur->name) - 1);
                cur->dead = 1;
        }
@@ -408,11 +390,6 @@ static int iax_process_template(struct ast_config *cfg, char *s, char *def)
        return 0;
 }
 
-static char show_provisioning_usage[] = 
-"Usage: iax show provisioning [template]\n"
-"       Lists all known IAX provisioning templates or a\n"
-"       specific one if specified.\n";
-
 static const char *ifthere(const char *s)
 {
        if (strlen(s))
@@ -421,58 +398,80 @@ static const char *ifthere(const char *s)
                return "<unspecified>";
 }
 
-static const char *iax_server(char *a, int alen, unsigned int addr)
+static const char *iax_server(unsigned int addr)
 {
        struct in_addr ia;
+       
        if (!addr)
                return "<unspecified>";
+       
        ia.s_addr = htonl(addr);
-       return ast_inet_ntoa(a, alen, ia);
+
+       return ast_inet_ntoa(ia);
 }
 
 
-static int iax_show_provisioning(int fd, int argc, char *argv[])
+static char *iax_show_provisioning(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
        struct iax_template *cur;
-       char iabuf[80]; /* Has to be big enough for 'flags' too */
+       char server[INET_ADDRSTRLEN];
+       char alternate[INET_ADDRSTRLEN];
+       char flags[80]; /* Has to be big enough for 'flags' too */
        int found = 0;
-       if ((argc != 3) && (argc != 4))
-               return RESULT_SHOWUSAGE;
+
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "iax2 show provisioning";
+               e->usage =
+                       "Usage: iax2 show provisioning [template]\n"
+                       "       Lists all known IAX provisioning templates or a\n"
+                       "       specific one if specified.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return iax_prov_complete_template(a->line, a->word, a->pos, a->n);
+       }
+
+       if ((a->argc != 3) && (a->argc != 4))
+               return CLI_SHOWUSAGE;
        ast_mutex_lock(&provlock);
        for (cur = templates;cur;cur = cur->next) {
-               if ((argc == 3) || (!strcasecmp(argv[3], cur->name)))  {
-                       if (found) ast_cli(fd, "\n");
-                       ast_cli(fd, "== %s ==\n", cur->name);
-                       ast_cli(fd, "Base Templ:   %s\n", strlen(cur->src) ? cur->src : "<none>");
-                       ast_cli(fd, "Username:     %s\n", ifthere(cur->user));
-                       ast_cli(fd, "Secret:       %s\n", ifthere(cur->pass));
-                       ast_cli(fd, "Language:     %s\n", ifthere(cur->lang));
-                       ast_cli(fd, "Bind Port:    %d\n", cur->port);
-                       ast_cli(fd, "Server:       %s\n", iax_server(iabuf, sizeof(iabuf), cur->server));
-                       ast_cli(fd, "Server Port:  %d\n", cur->serverport);
-                       ast_cli(fd, "Alternate:    %s\n", iax_server(iabuf, sizeof(iabuf), cur->altserver));
-                       ast_cli(fd, "Flags:        %s\n", iax_provflags2str(iabuf, sizeof(iabuf), cur->flags));
-                       ast_cli(fd, "Format:       %s\n", ast_getformatname(cur->format));
-                       ast_cli(fd, "TOS:          %d\n", cur->tos);
+               if ((a->argc == 3) || (!strcasecmp(a->argv[3], cur->name)))  {
+                       if (found) 
+                               ast_cli(a->fd, "\n");
+                       ast_copy_string(server, iax_server(cur->server), sizeof(server));
+                       ast_copy_string(alternate, iax_server(cur->altserver), sizeof(alternate));
+                       ast_cli(a->fd, "== %s ==\n", cur->name);
+                       ast_cli(a->fd, "Base Templ:   %s\n", strlen(cur->src) ? cur->src : "<none>");
+                       ast_cli(a->fd, "Username:     %s\n", ifthere(cur->user));
+                       ast_cli(a->fd, "Secret:       %s\n", ifthere(cur->pass));
+                       ast_cli(a->fd, "Language:     %s\n", ifthere(cur->lang));
+                       ast_cli(a->fd, "Bind Port:    %d\n", cur->port);
+                       ast_cli(a->fd, "Server:       %s\n", server);
+                       ast_cli(a->fd, "Server Port:  %d\n", cur->serverport);
+                       ast_cli(a->fd, "Alternate:    %s\n", alternate);
+                       ast_cli(a->fd, "Flags:        %s\n", iax_provflags2str(flags, sizeof(flags), cur->flags));
+                       ast_cli(a->fd, "Format:       %s\n", ast_getformatname(cur->format));
+                       ast_cli(a->fd, "TOS:          0x%x\n", cur->tos);
                        found++;
                }
        }
        ast_mutex_unlock(&provlock);
        if (!found) {
-               if (argc == 3)
-                       ast_cli(fd, "No provisioning templates found\n");
+               if (a->argc == 3)
+                       ast_cli(a->fd, "No provisioning templates found\n");
                else
-                       ast_cli(fd, "No provisioning template matching '%s' found\n", argv[3]);
+                       ast_cli(a->fd, "No provisioning template matching '%s' found\n", a->argv[3]);
        }
-       return RESULT_SUCCESS;
+       return CLI_SUCCESS;
 }
 
-static struct ast_cli_entry  cli_show_provisioning = 
-       { { "iax2", "show", "provisioning", NULL }, iax_show_provisioning, "Show iax provisioning", show_provisioning_usage, iax_prov_complete_template };
+static struct ast_cli_entry cli_iax2_provision[] = {
+       AST_CLI_DEFINE(iax_show_provisioning, "Display iax provisioning"),
+};
 
 static int iax_provision_init(void)
 {
-       ast_cli_register(&cli_show_provisioning);
+       ast_cli_register_multiple(cli_iax2_provision, sizeof(cli_iax2_provision) / sizeof(struct ast_cli_entry));
        provinit = 1;
        return 0;
 }
@@ -480,16 +479,17 @@ static int iax_provision_init(void)
 int iax_provision_unload(void)
 {
        provinit = 0;
-       ast_cli_unregister(&cli_show_provisioning);
+       ast_cli_unregister_multiple(cli_iax2_provision, sizeof(cli_iax2_provision) / sizeof(struct ast_cli_entry));
        return 0;
 }
 
-int iax_provision_reload(void)
+int iax_provision_reload(int reload)
 {
        struct ast_config *cfg;
        struct iax_template *cur, *prev, *next;
        char *cat;
        int found = 0;
+       struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
        if (!provinit)
                iax_provision_init();
        /* Mark all as dead.  No need for locking */
@@ -498,21 +498,22 @@ int iax_provision_reload(void)
                cur->dead = 1;
                cur = cur->next;
        }
-       cfg = ast_config_load("iaxprov.conf");
-       if (cfg) {
+       cfg = ast_config_load("iaxprov.conf", config_flags);
+       if (cfg != NULL && cfg != CONFIG_STATUS_FILEUNCHANGED) {
                /* Load as appropriate */
                cat = ast_category_browse(cfg, NULL);
                while(cat) {
                        if (strcasecmp(cat, "general")) {
                                iax_process_template(cfg, cat, found ? "default" : NULL);
                                found++;
-                               if (option_verbose > 2)
-                                       ast_verbose(VERBOSE_PREFIX_3 "Loaded provisioning template '%s'\n", cat);
+                               ast_verb(3, "Loaded provisioning template '%s'\n", cat);
                        }
                        cat = ast_category_browse(cfg, cat);
                }
                ast_config_destroy(cfg);
-       } else
+       } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
+               return 0;
+       else
                ast_log(LOG_NOTICE, "No IAX provisioning configuration found, IAX provisioning disabled.\n");
        ast_mutex_lock(&provlock);
        /* Drop dead entries while locked */
@@ -525,7 +526,7 @@ int iax_provision_reload(void)
                                prev->next = next;
                        else
                                templates = next;
-                       free(cur);
+                       ast_free(cur);
                } else 
                        prev = cur;
                cur = next;