Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.6] libs, ospfd: remove inet_ntoa #7979

Merged
merged 1 commit into from
Jan 29, 2021

Conversation

mjstapp
Copy link
Contributor

@mjstapp mjstapp commented Jan 29, 2021

[7.6 version] remove calls to inet_ntoa, introduced recently.

inet_ntoa not permitted - replace instances. [7.6 version]

Signed-off-by: Mark Stapp <mjs@voltanet.io>
Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/54913b1f7455710f38f71a03c6606489/raw/f94b88e0668a6d93a52f1cba4cf0595f57f18b61/cr_7979_1611926584.diff | git apply

diff --git a/lib/link_state.c b/lib/link_state.c
index 8dc5ab8ee..90495ea55 100644
--- a/lib/link_state.c
+++ b/lib/link_state.c
@@ -1272,11 +1272,9 @@ void ls_dump_ted(struct ls_ted *ted)
 	}
 	frr_each(subnets, &ted->subnets, subnet) {
 		ls_subnet2msg(&msg, subnet);
-		zlog_debug(
-			"\tTed subnet key:%pFX vertex:%pI4 pfx:%pFX",
-			&subnet->key,
-			&subnet->vertex->node->adv.id.ip.addr,
-			&subnet->ls_pref->pref);
+		zlog_debug("\tTed subnet key:%pFX vertex:%pI4 pfx:%pFX",
+			   &subnet->key, &subnet->vertex->node->adv.id.ip.addr,
+			   &subnet->ls_pref->pref);
 	}
 	zlog_debug("(%s) Ted end", __func__);
 }
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index a71453854..bfd82a1d3 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2854,10 +2854,11 @@ static int ospf_maxage_lsa_remover(struct thread *thread)
 				 * as the LSA in LSDB
 				 */
 				if (old != lsa) {
-					flog_err(EC_OSPF_LSA_MISSING,
-						 "%s: LSA[Type%d:%pI4]: LSA not in LSDB",
-						 __func__, lsa->data->type,
-						 &lsa->data->id);
+					flog_err(
+						EC_OSPF_LSA_MISSING,
+						"%s: LSA[Type%d:%pI4]: LSA not in LSDB",
+						__func__, lsa->data->type,
+						&lsa->data->id);
 
 					continue;
 				}

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

@mjstapp mjstapp added the libfrr label Jan 29, 2021
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16832/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16832/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210129-02-gaedbc33d9-0 (missing) -> 7.6-dev-20210129-02-gaedbc33d9-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210129-02-gaedbc33d9-0 (missing) -> 7.6-dev-20210129-02-gaedbc33d9-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210129-02-gaedbc33d9-0 (missing) -> 7.6-dev-20210129-02-gaedbc33d9-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210129-02-gaedbc33d9-0 (missing) -> 7.6-dev-20210129-02-gaedbc33d9-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210129-02-gaedbc33d9-0 (missing) -> 7.6-dev-20210129-02-gaedbc33d9-0~deb10u1

@qlyoung qlyoung merged commit cb147ec into FRRouting:dev/7.6 Jan 29, 2021
@mjstapp mjstapp deleted the fix_more_ntoa_7_6 branch April 9, 2021 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants