diff options
| -rw-r--r-- | usr.sbin/bgpd/session.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 9cd2b9b9427..0d608167ae3 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.316 2010/12/23 17:41:40 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.317 2011/05/05 06:21:44 henning Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -1286,8 +1286,7 @@ session_newmsg(enum msg_type msgtype, u_int16_t len) errs += ibuf_add(buf, &hdr.len, sizeof(hdr.len)); errs += ibuf_add(buf, &hdr.type, sizeof(hdr.type)); - if (errs > 0 || - (msg = calloc(1, sizeof(*msg))) == NULL) { + if (errs || (msg = calloc(1, sizeof(*msg))) == NULL) { ibuf_free(buf); return (NULL); } @@ -1327,7 +1326,7 @@ session_open(struct peer *p) struct msg_open msg; u_int16_t len; u_int8_t i, op_type, optparamlen = 0; - u_int errs = 0; + int errs = 0; if ((opb = ibuf_dynamic(0, UCHAR_MAX - sizeof(op_type) - @@ -1402,7 +1401,7 @@ session_open(struct peer *p) ibuf_free(opb); - if (errs > 0) { + if (errs) { ibuf_free(buf->buf); free(buf); bgp_fsm(p, EVNT_CON_FATAL); @@ -1472,7 +1471,7 @@ session_notification(struct peer *p, u_int8_t errcode, u_int8_t subcode, void *data, ssize_t datalen) { struct bgp_msg *buf; - u_int errs = 0; + int errs = 0; if (p->stats.last_sent_errcode) /* some notification already sent */ return; @@ -1491,7 +1490,7 @@ session_notification(struct peer *p, u_int8_t errcode, u_int8_t subcode, if (datalen > 0) errs += ibuf_add(buf->buf, data, datalen); - if (errs > 0) { + if (errs) { ibuf_free(buf->buf); free(buf); bgp_fsm(p, EVNT_CON_FATAL); @@ -1545,7 +1544,7 @@ session_rrefresh(struct peer *p, u_int8_t aid) errs += ibuf_add(buf->buf, &null8, sizeof(null8)); errs += ibuf_add(buf->buf, &safi, sizeof(safi)); - if (errs > 0) { + if (errs) { ibuf_free(buf->buf); free(buf); bgp_fsm(p, EVNT_CON_FATAL); |