<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11687">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipaccess-config: Use stderr for debug type messages<br><br>This way we want print only a formated output in stdout when using -G.<br><br>Related: OS#3624<br>Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e<br>---<br>M src/ipaccess/ipaccess-config.c<br>1 file changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11687/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c</span><br><span>index 93b934b..3de68aa 100644</span><br><span>--- a/src/ipaccess/ipaccess-config.c</span><br><span>+++ b/src/ipaccess/ipaccess-config.c</span><br><span>@@ -545,7 +545,7 @@</span><br><span> int need_to_set_attr = 0;</span><br><span> int len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("OML link established using TRX %d\n", trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "OML link established using TRX %d\n", trx->nr);</span><br><span> </span><br><span> if (get_attr) {</span><br><span> msgb_put_u8(nmsg_get, NM_ATT_IPACC_PRIM_OML_CFG);</span><br><span>@@ -555,7 +555,7 @@</span><br><span> len = strlen(unit_id);</span><br><span> if (len > nmsg_set->data_len-10)</span><br><span> goto out_err;</span><br><span style="color: hsl(0, 100%, 40%);">- printf("setting Unit ID to '%s'\n", unit_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "setting Unit ID to '%s'\n", unit_id);</span><br><span> nv_put_unit_id(nmsg_set, unit_id);</span><br><span> need_to_set_attr = 1;</span><br><span> }</span><br><span>@@ -568,12 +568,12 @@</span><br><span> goto out_err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia));</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "setting primary OML link IP to '%s'\n", inet_ntoa(ia));</span><br><span> nv_put_prim_oml(nmsg_set, ntohl(ia.s_addr), 0);</span><br><span> need_to_set_attr = 1;</span><br><span> }</span><br><span> if (nv_mask) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("setting NV Flags/Mask to 0x%04x/0x%04x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "setting NV Flags/Mask to 0x%04x/0x%04x\n",</span><br><span> nv_flags, nv_mask);</span><br><span> nv_put_flags(nmsg_set, nv_flags, nv_mask);</span><br><span> need_to_set_attr = 1;</span><br><span>@@ -593,7 +593,7 @@</span><br><span> goto out_err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("setting static IP Address/Mask\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "setting static IP Address/Mask\n");</span><br><span> nv_put_ip_if_cfg(nmsg_set, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr));</span><br><span> need_to_set_attr = 1;</span><br><span> }</span><br><span>@@ -606,7 +606,7 @@</span><br><span> goto out_err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("setting static IP Gateway\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "setting static IP Gateway\n");</span><br><span> /* we only set the default gateway with zero addr/mask */</span><br><span> nv_put_gw_cfg(nmsg_set, 0, 0, ntohl(ia_gw.s_addr));</span><br><span> need_to_set_attr = 1;</span><br><span>@@ -619,13 +619,13 @@</span><br><span> }</span><br><span> </span><br><span> if (need_to_set_attr) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("abis_nm_ipaccess_set_nvattr\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "abis_nm_ipaccess_set_nvattr\n");</span><br><span> abis_nm_ipaccess_set_nvattr(trx, nmsg_set->head, nmsg_set->len);</span><br><span> oml_state = 1;</span><br><span> }</span><br><span> </span><br><span> if (restart && !prim_oml_ip && !software) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("restarting BTS\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "restarting BTS\n");</span><br><span> abis_nm_ipaccess_restart(trx);</span><br><span> }</span><br><span> </span><br><span>@@ -654,7 +654,7 @@</span><br><span> phys_conf_min, sizeof(phys_conf_min));</span><br><span> else if (software) {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Attempting software upload with '%s'\n", software);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Attempting software upload with '%s'\n", software);</span><br><span> rc = abis_nm_software_load(trx->bts, trx->nr, software, 19, 0, swload_cbfn, trx);</span><br><span> if (rc < 0) {</span><br><span> fprintf(stderr, "Failed to start software load\n");</span><br><span>@@ -963,8 +963,8 @@</span><br><span> osmo_init_logging2(tall_ctx_config, &log_info);</span><br><span> bts_model_nanobts_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("ipaccess-config (C) 2009-2010 by Harald Welte and others\n");</span><br><span style="color: hsl(0, 100%, 40%);">- printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "ipaccess-config (C) 2009-2010 by Harald Welte and others\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n");</span><br><span> </span><br><span> while (1) {</span><br><span> int c;</span><br><span>@@ -1115,7 +1115,7 @@</span><br><span> </span><br><span> ipac_nwl_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("Trying to connect to ip.access BTS %s...\n", bts_ip);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Trying to connect to ip.access BTS %s...\n", bts_ip);</span><br><span> </span><br><span> memset(&sin, 0, sizeof(sin));</span><br><span> sin.sin_family = AF_INET;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11687">change 11687</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/11687"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e </div>
<div style="display:none"> Gerrit-Change-Number: 11687 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>