From d2a9ef3dce1dba3ab50e760b6269620f8a26dda5 Mon Sep 17 00:00:00 2001 From: markster Date: Mon, 3 Jan 2005 01:46:19 +0000 Subject: Fix various formatting errors (bug #3226) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4641 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_test.c | 110 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 38 deletions(-) (limited to 'apps/app_test.c') diff --git a/apps/app_test.c b/apps/app_test.c index 3743b6771..091112e6f 100755 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -1,7 +1,7 @@ /* * Asterisk -- A telephony toolkit for Linux. * - * Applictions connected with CDR engine + * Applications to test connection and produce report in text file * * Copyright (C) 2004, Digium, Inc. * @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -29,13 +30,15 @@ static char *tdesc = "Interface Test Application"; -static char *tests_descrip = "TestServer(): Perform test server function and write call report" - "Results stored in /var/log/asterisk/testreports/.txt"; +static char *tests_descrip = + "TestServer(): Perform test server function and write call report.\n" + "Results stored in /var/log/asterisk/testreports/-server.txt"; static char *tests_app = "TestServer"; static char *tests_synopsis = "Execute Interface Test Server"; -static char *testc_descrip = "TestClient(testid): Executes test client with given testid.\n" - "Results stored in /var/log/asterisk/testreports/.txt"; +static char *testc_descrip = + "TestClient(testid): Executes test client with given testid.\n" + "Results stored in /var/log/asterisk/testreports/-client.txt"; static char *testc_app = "TestClient"; static char *testc_synopsis = "Execute Interface Test Client"; @@ -135,15 +138,18 @@ static int testclient_exec(struct ast_channel *chan, void *data) /* Transmit client version */ if (!res) res = ast_dtmf_stream(chan, NULL, "8378*1#", 0); - ast_log(LOG_DEBUG, "Transmit client version\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Transmit client version\n"); /* Read server version */ - ast_log(LOG_DEBUG, "Read server version\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Read server version\n"); if (!res) res = ast_app_getdata(chan, NULL, serverver, sizeof(serverver) - 1, 0); if (res > 0) res = 0; - ast_log(LOG_DEBUG, "server version: %s\n", serverver); + if (option_debug) + ast_log(LOG_DEBUG, "server version: %s\n", serverver); if (res > 0) res = 0; @@ -155,7 +161,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) res = ast_dtmf_stream(chan, NULL, testid, 0); if (!res) res = ast_dtmf_stream(chan, NULL, "#", 0); - ast_log(LOG_DEBUG, "send test identifier: %s\n", testid); + if (option_debug) + ast_log(LOG_DEBUG, "send test identifier: %s\n", testid); if ((res >=0) && (!ast_strlen_zero(testid))) { /* Make the directory to hold the test results in case it's not there */ @@ -171,7 +178,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) if (!res) { /* Step 1: Wait for "1" */ - ast_log(LOG_DEBUG, "TestClient: 2. Wait DTMF 1\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 2. Wait DTMF 1\n"); res = ast_waitfordigit(chan, 3000); fprintf(f, "WAIT DTMF 1: %s\n", (res != '1') ? "FAIL" : "PASS"); if (res == '1') @@ -183,7 +191,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) res = ast_safe_sleep(chan, 1000); if (!res) { /* Step 2: Send "2" */ - ast_log(LOG_DEBUG, "TestClient: 2. Send DTMF 2\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 2. Send DTMF 2\n"); res = ast_dtmf_stream(chan, NULL, "2", 0); fprintf(f, "SEND DTMF 2: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -191,7 +200,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 3: Wait one second */ - ast_log(LOG_DEBUG, "TestClient: 3. Wait one second\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 3. Wait one second\n"); res = ast_safe_sleep(chan, 1000); fprintf(f, "WAIT 1 SEC: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -199,7 +209,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 4: Measure noise */ - ast_log(LOG_DEBUG, "TestClient: 4. Measure noise\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 4. Measure noise\n"); res = measurenoise(chan, 5000, "TestClient"); fprintf(f, "MEASURENOISE: %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res); if (res > 0) @@ -207,7 +218,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 5: Wait for "4" */ - ast_log(LOG_DEBUG, "TestClient: 5. Wait DTMF 4\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 5. Wait DTMF 4\n"); res = ast_waitfordigit(chan, 3000); fprintf(f, "WAIT DTMF 4: %s\n", (res != '4') ? "FAIL" : "PASS"); if (res == '4') @@ -217,13 +229,15 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 6: Transmit tone noise */ - ast_log(LOG_DEBUG, "TestClient: 6. Transmit tone\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 6. Transmit tone\n"); res = sendnoise(chan, 6000); fprintf(f, "SENDTONE: %s\n", (res < 0) ? "FAIL" : "PASS"); } if (!res || (res == '5')) { /* Step 7: Wait for "5" */ - ast_log(LOG_DEBUG, "TestClient: 7. Wait DTMF 5\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 7. Wait DTMF 5\n"); if (!res) res = ast_waitfordigit(chan, 3000); fprintf(f, "WAIT DTMF 5: %s\n", (res != '5') ? "FAIL" : "PASS"); @@ -234,7 +248,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 8: Wait one second */ - ast_log(LOG_DEBUG, "TestClient: 8. Wait one second\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 8. Wait one second\n"); res = ast_safe_sleep(chan, 1000); fprintf(f, "WAIT 1 SEC: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -242,7 +257,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 9: Measure noise */ - ast_log(LOG_DEBUG, "TestClient: 6. Measure tone\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 6. Measure tone\n"); res = measurenoise(chan, 4000, "TestClient"); fprintf(f, "MEASURETONE: %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res); if (res > 0) @@ -250,7 +266,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 10: Send "7" */ - ast_log(LOG_DEBUG, "TestClient: 7. Send DTMF 7\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 7. Send DTMF 7\n"); res = ast_dtmf_stream(chan, NULL, "7", 0); fprintf(f, "SEND DTMF 7: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -258,7 +275,8 @@ static int testclient_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 11: Wait for "8" */ - ast_log(LOG_DEBUG, "TestClient: 11. Wait DTMF 8\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestClient: 11. Wait DTMF 8\n"); res = ast_waitfordigit(chan, 3000); fprintf(f, "WAIT DTMF 8: %s\n", (res != '8') ? "FAIL" : "PASS"); if (res == '8') @@ -266,12 +284,13 @@ static int testclient_exec(struct ast_channel *chan, void *data) else res = -1; } - if (!res) { + if (option_debug && !res ) { /* Step 12: Hangup! */ ast_log(LOG_DEBUG, "TestClient: 12. Hangup\n"); } - ast_log(LOG_DEBUG, "-- TEST COMPLETE--\n"); + if (option_debug) + ast_log(LOG_DEBUG, "-- TEST COMPLETE--\n"); fprintf(f, "-- END TEST--\n"); fclose(f); res = -1; @@ -296,13 +315,16 @@ static int testserver_exec(struct ast_channel *chan, void *data) if (chan->_state != AST_STATE_UP) res = ast_answer(chan); /* Read version */ - ast_log(LOG_DEBUG, "Read client version\n"); + if (option_debug) + ast_log(LOG_DEBUG, "Read client version\n"); if (!res) res = ast_app_getdata(chan, NULL, testid, sizeof(testid) - 1, 0); if (res > 0) res = 0; - ast_log(LOG_DEBUG, "client version: %s\n", testid); - ast_log(LOG_DEBUG, "Transmit server version\n"); + if (option_debug) { + ast_log(LOG_DEBUG, "client version: %s\n", testid); + ast_log(LOG_DEBUG, "Transmit server version\n"); + } res = ast_safe_sleep(chan, 1000); if (!res) res = ast_dtmf_stream(chan, NULL, "8378*1#", 0); @@ -311,7 +333,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) if (!res) res = ast_app_getdata(chan, NULL, testid, sizeof(testid) - 1, 0); - ast_log(LOG_DEBUG, "read test identifier: %s\n", testid); + if (option_debug) + ast_log(LOG_DEBUG, "read test identifier: %s\n", testid); /* Check for sneakyness */ if (strchr(testid, '/')) res = -1; @@ -330,7 +353,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) res = ast_safe_sleep(chan, 1000); if (!res) { /* Step 1: Send "1" */ - ast_log(LOG_DEBUG, "TestServer: 1. Send DTMF 1\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 1. Send DTMF 1\n"); res = ast_dtmf_stream(chan, NULL, "1", 0); fprintf(f, "SEND DTMF 1: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -338,7 +362,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 2: Wait for "2" */ - ast_log(LOG_DEBUG, "TestServer: 2. Wait DTMF 2\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 2. Wait DTMF 2\n"); res = ast_waitfordigit(chan, 3000); fprintf(f, "WAIT DTMF 2: %s\n", (res != '2') ? "FAIL" : "PASS"); if (res == '2') @@ -348,7 +373,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 3: Measure noise */ - ast_log(LOG_DEBUG, "TestServer: 3. Measure noise\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 3. Measure noise\n"); res = measurenoise(chan, 6000, "TestServer"); fprintf(f, "MEASURENOISE: %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res); if (res > 0) @@ -356,7 +382,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 4: Send "4" */ - ast_log(LOG_DEBUG, "TestServer: 4. Send DTMF 4\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 4. Send DTMF 4\n"); res = ast_dtmf_stream(chan, NULL, "4", 0); fprintf(f, "SEND DTMF 4: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -365,7 +392,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) if (!res) { /* Step 5: Wait one second */ - ast_log(LOG_DEBUG, "TestServer: 5. Wait one second\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 5. Wait one second\n"); res = ast_safe_sleep(chan, 1000); fprintf(f, "WAIT 1 SEC: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -374,7 +402,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) if (!res) { /* Step 6: Measure noise */ - ast_log(LOG_DEBUG, "TestServer: 6. Measure tone\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 6. Measure tone\n"); res = measurenoise(chan, 4000, "TestServer"); fprintf(f, "MEASURETONE: %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res); if (res > 0) @@ -383,7 +412,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) if (!res) { /* Step 7: Send "5" */ - ast_log(LOG_DEBUG, "TestServer: 7. Send DTMF 5\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 7. Send DTMF 5\n"); res = ast_dtmf_stream(chan, NULL, "5", 0); fprintf(f, "SEND DTMF 5: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -392,14 +422,16 @@ static int testserver_exec(struct ast_channel *chan, void *data) if (!res) { /* Step 8: Transmit tone noise */ - ast_log(LOG_DEBUG, "TestServer: 8. Transmit tone\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 8. Transmit tone\n"); res = sendnoise(chan, 6000); fprintf(f, "SENDTONE: %s\n", (res < 0) ? "FAIL" : "PASS"); } if (!res || (res == '7')) { /* Step 9: Wait for "7" */ - ast_log(LOG_DEBUG, "TestServer: 9. Wait DTMF 7\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 9. Wait DTMF 7\n"); if (!res) res = ast_waitfordigit(chan, 3000); fprintf(f, "WAIT DTMF 7: %s\n", (res != '7') ? "FAIL" : "PASS"); @@ -412,7 +444,8 @@ static int testserver_exec(struct ast_channel *chan, void *data) res = ast_safe_sleep(chan, 1000); if (!res) { /* Step 10: Send "8" */ - ast_log(LOG_DEBUG, "TestServer: 10. Send DTMF 8\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 10. Send DTMF 8\n"); res = ast_dtmf_stream(chan, NULL, "8", 0); fprintf(f, "SEND DTMF 8: %s\n", (res < 0) ? "FAIL" : "PASS"); if (res > 0) @@ -420,12 +453,13 @@ static int testserver_exec(struct ast_channel *chan, void *data) } if (!res) { /* Step 11: Wait for hangup to arrive! */ - ast_log(LOG_DEBUG, "TestServer: 11. Waiting for hangup\n"); + if (option_debug) + ast_log(LOG_DEBUG, "TestServer: 11. Waiting for hangup\n"); res = ast_safe_sleep(chan, 10000); fprintf(f, "WAIT HANGUP: %s\n", (res < 0) ? "PASS" : "FAIL"); } - ast_log(LOG_DEBUG, "-- TEST COMPLETE--\n"); + ast_log(LOG_NOTICE, "-- TEST COMPLETE--\n"); fprintf(f, "-- END TEST--\n"); fclose(f); res = -1; -- cgit v1.2.3