| proto.c (256281) | proto.c (260006) |
|---|---|
| 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Pawel Jakub Dawidek under sponsorship from 6 * the FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Pawel Jakub Dawidek under sponsorship from 6 * the FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: stable/10/sbin/hastd/proto.c 229945 2012-01-10 22:39:07Z pjd $"); | 31__FBSDID("$FreeBSD: stable/10/sbin/hastd/proto.c 260006 2013-12-28 19:21:22Z trociny $"); |
| 32 33#include <sys/types.h> 34#include <sys/queue.h> 35#include <sys/socket.h> 36 37#include <errno.h> 38#include <stdint.h> 39#include <string.h> --- 253 unchanged lines hidden (view full) --- 293 PJDLOG_ASSERT(mconn != NULL); 294 PJDLOG_ASSERT(mconn->pc_magic == PROTO_CONN_MAGIC); 295 PJDLOG_ASSERT(mconn->pc_proto != NULL); 296 fd = proto_descriptor(mconn); 297 PJDLOG_ASSERT(fd >= 0); 298 protoname = mconn->pc_proto->prt_name; 299 PJDLOG_ASSERT(protoname != NULL); 300 | 32 33#include <sys/types.h> 34#include <sys/queue.h> 35#include <sys/socket.h> 36 37#include <errno.h> 38#include <stdint.h> 39#include <string.h> --- 253 unchanged lines hidden (view full) --- 293 PJDLOG_ASSERT(mconn != NULL); 294 PJDLOG_ASSERT(mconn->pc_magic == PROTO_CONN_MAGIC); 295 PJDLOG_ASSERT(mconn->pc_proto != NULL); 296 fd = proto_descriptor(mconn); 297 PJDLOG_ASSERT(fd >= 0); 298 protoname = mconn->pc_proto->prt_name; 299 PJDLOG_ASSERT(protoname != NULL); 300 |
| 301 ret = conn->pc_proto->prt_send(conn->pc_ctx, protoname, 302 strlen(protoname) + 1, fd); | 301 ret = conn->pc_proto->prt_send(conn->pc_ctx, 302 (const unsigned char *)protoname, strlen(protoname) + 1, fd); |
| 303 proto_close(mconn); 304 if (ret != 0) { 305 errno = ret; 306 return (-1); 307 } 308 return (0); 309} 310 --- 9 unchanged lines hidden (view full) --- 320 PJDLOG_ASSERT(conn != NULL); 321 PJDLOG_ASSERT(conn->pc_magic == PROTO_CONN_MAGIC); 322 PJDLOG_ASSERT(conn->pc_proto != NULL); 323 PJDLOG_ASSERT(conn->pc_proto->prt_recv != NULL); 324 PJDLOG_ASSERT(newconnp != NULL); 325 326 bzero(protoname, sizeof(protoname)); 327 | 303 proto_close(mconn); 304 if (ret != 0) { 305 errno = ret; 306 return (-1); 307 } 308 return (0); 309} 310 --- 9 unchanged lines hidden (view full) --- 320 PJDLOG_ASSERT(conn != NULL); 321 PJDLOG_ASSERT(conn->pc_magic == PROTO_CONN_MAGIC); 322 PJDLOG_ASSERT(conn->pc_proto != NULL); 323 PJDLOG_ASSERT(conn->pc_proto->prt_recv != NULL); 324 PJDLOG_ASSERT(newconnp != NULL); 325 326 bzero(protoname, sizeof(protoname)); 327 |
| 328 ret = conn->pc_proto->prt_recv(conn->pc_ctx, protoname, | 328 ret = conn->pc_proto->prt_recv(conn->pc_ctx, (unsigned char *)protoname, |
| 329 sizeof(protoname) - 1, &fd); 330 if (ret != 0) { 331 errno = ret; 332 return (-1); 333 } 334 335 PJDLOG_ASSERT(fd >= 0); 336 --- 110 unchanged lines hidden --- | 329 sizeof(protoname) - 1, &fd); 330 if (ret != 0) { 331 errno = ret; 332 return (-1); 333 } 334 335 PJDLOG_ASSERT(fd >= 0); 336 --- 110 unchanged lines hidden --- |