diff options
-rw-r--r-- | channels/chan_sip.c | 23 | ||||
-rw-r--r-- | channels/chan_unistim.c | 8 | ||||
-rw-r--r-- | main/config.c | 23 | ||||
-rw-r--r-- | main/loader.c | 7 | ||||
-rw-r--r-- | main/tcptls.c | 6 |
5 files changed, 38 insertions, 29 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 75b207e1b..f6ccad8c3 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7372,16 +7372,23 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p case 4: f = ast_rtp_instance_read(p->trtp, 0); /* RTP Text */ if (sipdebug_text) { + struct ast_str *out = ast_str_create(f->datalen * 4 + 6); int i; unsigned char* arr = f->data.ptr; - for (i=0; i < f->datalen; i++) { - ast_verbose("%c", (arr[i] > ' ' && arr[i] < '}') ? arr[i] : '.'); - } - ast_verbose(" -> "); - for (i=0; i < f->datalen; i++) { - ast_verbose("%02X ", arr[i]); - } - ast_verbose("\n"); + do { + if (!out) { + break; + } + for (i = 0; i < f->datalen; i++) { + ast_str_append(&out, 0, "%c", (arr[i] > ' ' && arr[i] < '}') ? arr[i] : '.'); + } + ast_str_append(&out, 0, " -> "); + for (i = 0; i < f->datalen; i++) { + ast_str_append(&out, 0, "%02X ", arr[i]); + } + ast_verb(0, "%s\n", ast_str_buffer(out)); + ast_free(out); + } while (0); } break; case 5: diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 9a8c064c2..ac4d559a9 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -1558,14 +1558,14 @@ static void rcv_mac_addr(struct unistimsession *pte, const unsigned char *buf) int tmp, i = 0; char addrmac[19]; int res = 0; - if (unistimdebug) - ast_verb(0, "Mac Address received : "); for (tmp = 15; tmp < 15 + SIZE_HEADER; tmp++) { sprintf(&addrmac[i], "%.2x", (unsigned char) buf[tmp]); i += 2; } - if (unistimdebug) - ast_verb(0, "%s\n", addrmac); + if (unistimdebug) { + ast_verb(0, "Mac Address received : %s\n", addrmac); + } + strcpy(pte->macaddr, addrmac); res = unistim_register(pte); if (!res) { diff --git a/main/config.c b/main/config.c index e76a43fc4..9c0f73ac9 100644 --- a/main/config.c +++ b/main/config.c @@ -1503,18 +1503,16 @@ static struct ast_config *config_text_file_load(const char *database, const char if (cfmtime) cfmtime->mtime = statbuf.st_mtime; - ast_verb(2, "Parsing '%s': ", fn); - fflush(stdout); if (!(f = fopen(fn, "r"))) { ast_debug(1, "No file to parse: %s\n", fn); - ast_verb(2, "Not found (%s)\n", strerror(errno)); + ast_verb(2, "Parsing '%s': Not found (%s)\n", fn, strerror(errno)); continue; } count++; /* If we get to this point, then we're loading regardless */ ast_clear_flag(&flags, CONFIG_FLAG_FILEUNCHANGED); ast_debug(1, "Parsing %s\n", fn); - ast_verb(2, "Found\n"); + ast_verb(2, "Parsing '%s': Found\n", fn); while (!feof(f)) { lineno++; if (fgets(buf, sizeof(buf), f)) { @@ -1839,7 +1837,7 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c fclose(f); /* this should zero out the file */ } else { ast_debug(1, "Unable to open for writing: %s\n", fn); - ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno)); + ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno)); } if (fi) { ao2_ref(fi, -1); @@ -1856,7 +1854,7 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c (f = fopen(fn, "w")) #endif ) { - ast_verb(2, "Saving '%s': ", fn); + ast_verb(2, "Saving '%s'\n", fn); gen_header(f, configfile, fn, generator); cat = cfg->root; fclose(f); @@ -1873,7 +1871,7 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c f = fopen(fn, "a"); if (!f) { ast_debug(1, "Unable to open for writing: %s\n", fn); - ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno)); + ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno)); if (fi) { ao2_ref(fi, -1); } @@ -1964,7 +1962,7 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c f = fopen(fn, "a"); if (!f) { ast_debug(1, "Unable to open for writing: %s\n", fn); - ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno)); + ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno)); if (fi) { ao2_ref(fi, -1); } @@ -2013,11 +2011,12 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c } cat = cat->next; } - if (!option_debug) - ast_verb(2, "Saved\n"); + if (!option_debug) { + ast_verb(2, "Saving '%s': saved\n", fn); + } } else { ast_debug(1, "Unable to open for writing: %s\n", fn); - ast_verb(2, "Unable to write (%s)", strerror(errno)); + ast_verb(2, "Unable to write '%s' (%s)\n", fn, strerror(errno)); if (fi) { ao2_ref(fi, -1); } @@ -2034,7 +2033,7 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c f = fopen(fn, "a"); if (!f) { ast_debug(1, "Unable to open for writing: %s\n", fn); - ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno)); + ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno)); if (fi) { ao2_ref(fi, -1); } diff --git a/main/loader.c b/main/loader.c index 6cd5ffbdb..f9b2de943 100644 --- a/main/loader.c +++ b/main/loader.c @@ -797,8 +797,11 @@ static enum ast_module_load_result start_resource(struct ast_module *mod) case AST_MODULE_LOAD_SUCCESS: if (!ast_fully_booted) { ast_verb(1, "%s => (%s)\n", mod->resource, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp))); - if (ast_opt_console && !option_verbose) - ast_verbose( "."); + if (ast_opt_console && !option_verbose) { + /* This never looks good on anything but the root console, so + * it's best not to try to funnel it through the logger. */ + fprintf(stdout, "."); + } } else { ast_verb(1, "Loaded %s => (%s)\n", mod->resource, mod->info->description); } diff --git a/main/tcptls.c b/main/tcptls.c index ae30e95e1..8210839c0 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -359,7 +359,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) if (SSL_CTX_use_certificate_file(cfg->ssl_ctx, cfg->certfile, SSL_FILETYPE_PEM) == 0) { if (!client) { /* Clients don't need a certificate, but if its setup we can use it */ - ast_verb(0, "SSL error loading cert file. <%s>", cfg->certfile); + ast_verb(0, "SSL error loading cert file. <%s>\n", cfg->certfile); sleep(2); cfg->enabled = 0; return 0; @@ -368,7 +368,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) if ((SSL_CTX_use_PrivateKey_file(cfg->ssl_ctx, tmpprivate, SSL_FILETYPE_PEM) == 0) || (SSL_CTX_check_private_key(cfg->ssl_ctx) == 0 )) { if (!client) { /* Clients don't need a private key, but if its setup we can use it */ - ast_verb(0, "SSL error loading private key file. <%s>", tmpprivate); + ast_verb(0, "SSL error loading private key file. <%s>\n", tmpprivate); sleep(2); cfg->enabled = 0; return 0; @@ -378,7 +378,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) if (!ast_strlen_zero(cfg->cipher)) { if (SSL_CTX_set_cipher_list(cfg->ssl_ctx, cfg->cipher) == 0 ) { if (!client) { - ast_verb(0, "SSL cipher error <%s>", cfg->cipher); + ast_verb(0, "SSL cipher error <%s>\n", cfg->cipher); sleep(2); cfg->enabled = 0; return 0; |