Deleted Added
full compact
proto.c (210869) proto.c (212033)
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: head/sbin/hastd/proto.c 210869 2010-08-05 17:56:41Z pjd $");
31__FBSDID("$FreeBSD: head/sbin/hastd/proto.c 212033 2010-08-30 22:26:42Z pjd $");
32
33#include <sys/types.h>
34#include <sys/queue.h>
35#include <sys/socket.h>
36
37#include <assert.h>
38#include <errno.h>
39#include <stdint.h>

--- 134 unchanged lines hidden (view full) ---

174 newconn->pc_side = PROTO_SIDE_SERVER_WORK;
175 newconn->pc_magic = PROTO_CONN_MAGIC;
176 *newconnp = newconn;
177
178 return (0);
179}
180
181int
32
33#include <sys/types.h>
34#include <sys/queue.h>
35#include <sys/socket.h>
36
37#include <assert.h>
38#include <errno.h>
39#include <stdint.h>

--- 134 unchanged lines hidden (view full) ---

174 newconn->pc_side = PROTO_SIDE_SERVER_WORK;
175 newconn->pc_magic = PROTO_CONN_MAGIC;
176 *newconnp = newconn;
177
178 return (0);
179}
180
181int
182proto_send(struct proto_conn *conn, const void *data, size_t size)
182proto_send(const struct proto_conn *conn, const void *data, size_t size)
183{
184 int ret;
185
186 assert(conn != NULL);
187 assert(conn->pc_magic == PROTO_CONN_MAGIC);
188 assert(conn->pc_proto != NULL);
189
190 ret = conn->pc_proto->hp_send(conn->pc_ctx, data, size);
191 if (ret != 0) {
192 errno = ret;
193 return (-1);
194 }
195 return (0);
196}
197
198int
183{
184 int ret;
185
186 assert(conn != NULL);
187 assert(conn->pc_magic == PROTO_CONN_MAGIC);
188 assert(conn->pc_proto != NULL);
189
190 ret = conn->pc_proto->hp_send(conn->pc_ctx, data, size);
191 if (ret != 0) {
192 errno = ret;
193 return (-1);
194 }
195 return (0);
196}
197
198int
199proto_recv(struct proto_conn *conn, void *data, size_t size)
199proto_recv(const struct proto_conn *conn, void *data, size_t size)
200{
201 int ret;
202
203 assert(conn != NULL);
204 assert(conn->pc_magic == PROTO_CONN_MAGIC);
205 assert(conn->pc_proto != NULL);
206
207 ret = conn->pc_proto->hp_recv(conn->pc_ctx, data, size);

--- 87 unchanged lines hidden ---
200{
201 int ret;
202
203 assert(conn != NULL);
204 assert(conn->pc_magic == PROTO_CONN_MAGIC);
205 assert(conn->pc_proto != NULL);
206
207 ret = conn->pc_proto->hp_recv(conn->pc_ctx, data, size);

--- 87 unchanged lines hidden ---