<p>Friendly Automation <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11113">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
Joshua C. Colp: 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;">jansson: json_pack with new format to verify required runtime version.<br><br>Add a json_pack at startup that will fail if runtime links against a<br>library older than jansson-2.11.<br><br>Change-Id: I101aebafe0f9407650206f7c552dad3d69377b5a<br>---<br>M include/asterisk/json.h<br>M main/asterisk.c<br>M main/json.c<br>3 files changed, 21 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/json.h b/include/asterisk/json.h</span><br><span>index 0a75e78..665380c 100644</span><br><span>--- a/include/asterisk/json.h</span><br><span>+++ b/include/asterisk/json.h</span><br><span>@@ -89,7 +89,7 @@</span><br><span> /*!</span><br><span> * \brief Initialize the JSON library.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-void ast_json_init(void);</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_json_init(void);</span><br><span> </span><br><span> /*!</span><br><span> * \brief Set custom allocators instead of the standard ast_malloc() and ast_free().</span><br><span>diff --git a/main/asterisk.c b/main/asterisk.c</span><br><span>index 36e956f..6d9a5f5 100644</span><br><span>--- a/main/asterisk.c</span><br><span>+++ b/main/asterisk.c</span><br><span>@@ -4059,7 +4059,7 @@</span><br><span> }</span><br><span> ast_verb(0, "PBX UUID: %s\n", pbx_uuid);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_json_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ check_init(ast_json_init(), "libjansson");</span><br><span> ast_ulaw_init();</span><br><span> ast_alaw_init();</span><br><span> tdd_init();</span><br><span>diff --git a/main/json.c b/main/json.c</span><br><span>index 9a94767..f72de41 100644</span><br><span>--- a/main/json.c</span><br><span>+++ b/main/json.c</span><br><span>@@ -693,10 +693,28 @@</span><br><span> return ast_json_string_create(ast_str_buffer(string));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void ast_json_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_json_init(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ json_t *version_check;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Setup to use Asterisk custom allocators */</span><br><span> ast_json_reset_alloc_funcs();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We depend on functionality of jansson-2.11 but don't actually use</span><br><span style="color: hsl(120, 100%, 40%);">+ * any symbols. If we link at runtime to less than 2.11 this json_pack</span><br><span style="color: hsl(120, 100%, 40%);">+ * will return NULL. */</span><br><span style="color: hsl(120, 100%, 40%);">+ version_check = json_pack("{s: o?, s: o*}",</span><br><span style="color: hsl(120, 100%, 40%);">+ "JSON", NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Bourne", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!version_check) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "There was a problem finding jansson 2.11 runtime libraries.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Please rebuild Asterisk using ./configure --with-jansson-bundled.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ json_decref(version_check);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> static void json_payload_destructor(void *obj)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11113">change 11113</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/+/11113"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I101aebafe0f9407650206f7c552dad3d69377b5a </div>
<div style="display:none"> Gerrit-Change-Number: 11113 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </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: Joshua C. Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>