| hast_proto.c (221078) | hast_proto.c (225787) |
|---|---|
| 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> 4 * All rights reserved. 5 * 6 * This software was developed by Pawel Jakub Dawidek under sponsorship from 7 * the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net> 4 * All rights reserved. 5 * 6 * This software was developed by Pawel Jakub Dawidek under sponsorship from 7 * the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sbin/hastd/hast_proto.c 221078 2011-04-26 19:52:21Z trociny $"); | 32__FBSDID("$FreeBSD: head/sbin/hastd/hast_proto.c 225787 2011-09-27 08:50:37Z pjd $"); |
| 33 34#include <sys/endian.h> 35 | 33 34#include <sys/endian.h> 35 |
| 36#include <assert.h> | |
| 37#include <errno.h> 38#include <strings.h> 39 40#include <hast.h> 41#include <ebuf.h> 42#include <nv.h> 43#include <pjdlog.h> 44#include <proto.h> --- 108 unchanged lines hidden (view full) --- 153 hdr.size = le32toh(hdr.size); 154 155 eb = ebuf_alloc(hdr.size); 156 if (eb == NULL) 157 goto fail; 158 if (ebuf_add_tail(eb, NULL, hdr.size) < 0) 159 goto fail; 160 hptr = ebuf_data(eb, NULL); | 36#include <errno.h> 37#include <strings.h> 38 39#include <hast.h> 40#include <ebuf.h> 41#include <nv.h> 42#include <pjdlog.h> 43#include <proto.h> --- 108 unchanged lines hidden (view full) --- 152 hdr.size = le32toh(hdr.size); 153 154 eb = ebuf_alloc(hdr.size); 155 if (eb == NULL) 156 goto fail; 157 if (ebuf_add_tail(eb, NULL, hdr.size) < 0) 158 goto fail; 159 hptr = ebuf_data(eb, NULL); |
| 161 assert(hptr != NULL); | 160 PJDLOG_ASSERT(hptr != NULL); |
| 162 if (proto_recv(conn, hptr, hdr.size) < 0) 163 goto fail; 164 nv = nv_ntoh(eb); 165 if (nv == NULL) 166 goto fail; 167 168 *nvp = nv; 169 return (0); --- 8 unchanged lines hidden (view full) --- 178 struct nv *nv, void *data, size_t size) 179{ 180 unsigned int ii; 181 bool freedata; 182 size_t dsize; 183 void *dptr; 184 int ret; 185 | 161 if (proto_recv(conn, hptr, hdr.size) < 0) 162 goto fail; 163 nv = nv_ntoh(eb); 164 if (nv == NULL) 165 goto fail; 166 167 *nvp = nv; 168 return (0); --- 8 unchanged lines hidden (view full) --- 177 struct nv *nv, void *data, size_t size) 178{ 179 unsigned int ii; 180 bool freedata; 181 size_t dsize; 182 void *dptr; 183 int ret; 184 |
| 186 assert(data != NULL); 187 assert(size > 0); | 185 PJDLOG_ASSERT(data != NULL); 186 PJDLOG_ASSERT(size > 0); |
| 188 189 ret = -1; 190 freedata = false; 191 dptr = data; 192 193 dsize = nv_get_uint32(nv, "size"); 194 if (dsize > size) { 195 errno = EINVAL; --- 28 unchanged lines hidden --- | 187 188 ret = -1; 189 freedata = false; 190 dptr = data; 191 192 dsize = nv_get_uint32(nv, "size"); 193 if (dsize > size) { 194 errno = EINVAL; --- 28 unchanged lines hidden --- |