diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2016-05-23 16:14:38 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2016-05-23 16:14:38 +0000 |
| commit | 23864ce1ee167f94ca9df3b42882c216d7b34615 (patch) | |
| tree | e600baca2cf148eb7cae83be7c23afa19a549a3a /usr.sbin/ldpd/hello.c | |
| parent | 74a0f263b82f760fff9cff8429f809bbb667cdba (diff) | |
More renaming.
Rename a few more things to improve readability.
* s/F_PW_CONTROLWORD_CONF/F_PW_CWORD_CONF/ (shorter)
* s/F_PW_CONTROLWORD/F_PW_CWORD/ (shorter)
* s/LDPD_FLAG_*/F_LDPD_*/ (consistency)
* s/lde_nbr_address/lde_addr/ (shorter)
* s/ldp_discovery_socket/ldp_disc_socket/ (shorter)
* s/ldp_ediscovery_socket/ldp_edisc_socket/ (shorter)
* s/ldp_sendboth/main_imsg_compose_both/ (consistency)
* s/cons/total/ (makes more sense)
* s/kaddr/ka/ (consistency with remaining code)
* Always use 'ln' for lde_nbrs (consistency)
Diffstat (limited to 'usr.sbin/ldpd/hello.c')
| -rw-r--r-- | usr.sbin/ldpd/hello.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ldpd/hello.c b/usr.sbin/ldpd/hello.c index ff1676e2517..99a8e7c9533 100644 --- a/usr.sbin/ldpd/hello.c +++ b/usr.sbin/ldpd/hello.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hello.c,v 1.33 2016/05/23 16:08:18 renato Exp $ */ +/* $OpenBSD: hello.c,v 1.34 2016/05/23 16:14:36 renato Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -156,7 +156,7 @@ recv_hello(struct iface *iface, struct in_addr src, char *buf, u_int16_t len) if (!tnbr) { if (!((flags & REQUEST_TARG_HELLO) && - leconf->flags & LDPD_FLAG_TH_ACCEPT)) + leconf->flags & F_LDPD_TH_ACCEPT)) return; tnbr = tnbr_new(leconf, src); @@ -320,8 +320,8 @@ tlv_decode_opt_hello_prms(char *buf, u_int16_t len, struct in_addr *addr, } buf += TLV_HDR_LEN + tlv_len; len -= TLV_HDR_LEN + tlv_len; - cons += TLV_HDR_LEN + tlv_len; + total += TLV_HDR_LEN + tlv_len; } - return (cons); + return (total); } |