<p>Friendly Automation <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11258">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Matthew Fredrickson: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_ooh323: fix h323 log file path<br><br>Change h323 log path relative to AST_LOG_DIR instead of<br>/var/log/asterisk hardcoded<br>Add return back error message from OOH323EP initialize<br><br>ASTERISK-28348 #close<br><br>Reported by: Dmitry Shubin<br><br>Change-Id: Ib102dd36bbe6c2a7a4ce6870ae9110d9000d7e98<br>---<br>M addons/chan_ooh323.c<br>M addons/chan_ooh323.h<br>M addons/ooh323c/src/ooh323ep.c<br>M addons/ooh323c/src/ooh323ep.h<br>4 files changed, 17 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c</span><br><span>index a883ace..e80fc34 100644</span><br><span>--- a/addons/chan_ooh323.c</span><br><span>+++ b/addons/chan_ooh323.c</span><br><span>@@ -82,7 +82,7 @@</span><br><span> /* Defaults */</span><br><span> #define DEFAULT_CONTEXT "default"</span><br><span> #define DEFAULT_H323ID "Asterisk PBX"</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEFAULT_LOGFILE "/var/log/asterisk/h323_log"</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_LOGFILE "h323_log"</span><br><span> #define DEFAULT_H323ACCNT "ast_h323"</span><br><span> </span><br><span> /* Flags */</span><br><span>@@ -346,7 +346,8 @@</span><br><span> </span><br><span> extern OOH323EndPoint gH323ep;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char gLogFile[256] = DEFAULT_LOGFILE;</span><br><span style="color: hsl(120, 100%, 40%);">+static char gLogFile[PATH_MAX] = DEFAULT_LOGFILE;</span><br><span style="color: hsl(120, 100%, 40%);">+static char gInitError[256] = "";</span><br><span> static int gPort = 1720;</span><br><span> static char gIP[2+8*4+7]; /* Max for IPv6 addr */</span><br><span> struct ast_sockaddr bindaddr;</span><br><span>@@ -2855,7 +2856,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Inintialize everything to default */</span><br><span style="color: hsl(0, 100%, 40%);">- strcpy(gLogFile, DEFAULT_LOGFILE);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(gLogFile, sizeof(gLogFile), "%s/%s", ast_config_AST_LOG_DIR, DEFAULT_LOGFILE);</span><br><span> gPort = 1720;</span><br><span> gIP[0] = '\0';</span><br><span> strcpy(gCallerID, DEFAULT_H323ID);</span><br><span>@@ -3029,7 +3030,11 @@</span><br><span> ast_copy_string(gGatekeeper, v->value, sizeof(gGatekeeper));</span><br><span> }</span><br><span> } else if (!strcasecmp(v->name, "logfile")) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_copy_string(gLogFile, v->value, sizeof(gLogFile));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (v->value[0] == '/') {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_copy_string(gLogFile, v->value, sizeof(gLogFile));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(gLogFile, sizeof(gLogFile), "%s/%s", ast_config_AST_LOG_DIR, v->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (!strcasecmp(v->name, "context")) {</span><br><span> ast_copy_string(gContext, v->value, sizeof(gContext));</span><br><span> ast_verb(3, " == Setting default context to %s\n", gContext);</span><br><span>@@ -3833,9 +3838,9 @@</span><br><span> if (!reload_config(0)) {</span><br><span> </span><br><span> /* fire up the H.323 Endpoint */</span><br><span style="color: hsl(0, 100%, 40%);">- if (OO_OK != ooH323EpInitialize(OO_CALLMODE_AUDIOCALL, gLogFile)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_ERROR, "Failed to initialize OOH323 endpoint-"</span><br><span style="color: hsl(0, 100%, 40%);">- "OOH323 Disabled\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (OO_OK != ooH323EpInitialize(OO_CALLMODE_AUDIOCALL, gLogFile, gInitError, sizeof(gInitError))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Failed to initialize OOH323 endpoint: %s"</span><br><span style="color: hsl(120, 100%, 40%);">+ "OOH323 Disabled\n", gInitError);</span><br><span> ao2_ref(gCap, -1);</span><br><span> gCap = NULL;</span><br><span> ao2_ref(ooh323_tech.capabilities, -1);</span><br><span>diff --git a/addons/chan_ooh323.h b/addons/chan_ooh323.h</span><br><span>index 0dde50b..ae26a0b 100644</span><br><span>--- a/addons/chan_ooh323.h</span><br><span>+++ b/addons/chan_ooh323.h</span><br><span>@@ -66,6 +66,7 @@</span><br><span> #include "asterisk/udptl.h"</span><br><span> #include "asterisk/stasis_channels.h"</span><br><span> #include "asterisk/format_cache.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "asterisk/paths.h"</span><br><span> </span><br><span> #include "ootypes.h"</span><br><span> #include "ooUtils.h"</span><br><span>diff --git a/addons/ooh323c/src/ooh323ep.c b/addons/ooh323c/src/ooh323ep.c</span><br><span>index 1dedecd..be43896 100644</span><br><span>--- a/addons/ooh323c/src/ooh323ep.c</span><br><span>+++ b/addons/ooh323c/src/ooh323ep.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> extern DList g_TimerList;</span><br><span> </span><br><span> int ooH323EpInitialize</span><br><span style="color: hsl(0, 100%, 40%);">- (enum OOCallMode callMode, const char* tracefile)</span><br><span style="color: hsl(120, 100%, 40%);">+ (enum OOCallMode callMode, const char* tracefile, char* errstr, int errstr_max)</span><br><span> {</span><br><span> </span><br><span> memset(&gH323ep, 0, sizeof(ooEndPoint));</span><br><span>@@ -46,7 +46,7 @@</span><br><span> {</span><br><span> if(strlen(tracefile)>= MAXFILENAME)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error:File name longer than allowed maximum %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(errstr, errstr_max, "Error:File name longer than allowed maximum %d\n",</span><br><span> MAXFILENAME-1);</span><br><span> return OO_FAILED;</span><br><span> }</span><br><span>@@ -59,7 +59,7 @@</span><br><span> gH323ep.fptraceFile = fopen(gH323ep.traceFile, "a");</span><br><span> if(gH323ep.fptraceFile == NULL)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error:Failed to open trace file %s for write.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(errstr, errstr_max, "Error:Failed to open trace file %s for write.\n",</span><br><span> gH323ep.traceFile);</span><br><span> return OO_FAILED;</span><br><span> }</span><br><span>diff --git a/addons/ooh323c/src/ooh323ep.h b/addons/ooh323c/src/ooh323ep.h</span><br><span>index a77b9e3..5c9c3dd 100644</span><br><span>--- a/addons/ooh323c/src/ooh323ep.h</span><br><span>+++ b/addons/ooh323c/src/ooh323ep.h</span><br><span>@@ -163,7 +163,7 @@</span><br><span> * @return OO_OK, on success. OO_FAILED, on failure</span><br><span> */</span><br><span> EXTERN int ooH323EpInitialize</span><br><span style="color: hsl(0, 100%, 40%);">- (enum OOCallMode callMode, const char* tracefile);</span><br><span style="color: hsl(120, 100%, 40%);">+ (enum OOCallMode callMode, const char* tracefile, char* errstr, int errstr_max);</span><br><span> </span><br><span> /**</span><br><span> * This function is used to represent the H.323 application endpoint as</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11258">change 11258</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11258"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-Change-Id: Ib102dd36bbe6c2a7a4ce6870ae9110d9000d7e98 </div>
<div style="display:none"> Gerrit-Change-Number: 11258 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Anikin <may213@yandex.ru> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>