Deleted Added
sdiff udiff text old ( 192595 ) new ( 204917 )
full compact
1/* $OpenBSD: monitor_fdpass.c,v 1.18 2008/11/30 11:59:26 dtucker Exp $ */
2/*
3 * Copyright 2001 Niels Provos <provos@citi.umich.edu>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

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

29#include <sys/types.h>
30#include <sys/socket.h>
31#include <sys/uio.h>
32#ifdef HAVE_SYS_UN_H
33#include <sys/un.h>
34#endif
35
36#include <errno.h>
37#include <string.h>
38#include <stdarg.h>
39
40#include "log.h"
41#include "monitor_fdpass.h"
42
43int
44mm_send_fd(int sock, int fd)

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

50 struct cmsghdr hdr;
51 char buf[CMSG_SPACE(sizeof(int))];
52 } cmsgbuf;
53 struct cmsghdr *cmsg;
54#endif
55 struct iovec vec;
56 char ch = '\0';
57 ssize_t n;
58
59 memset(&msg, 0, sizeof(msg));
60#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
61 msg.msg_accrights = (caddr_t)&fd;
62 msg.msg_accrightslen = sizeof(fd);
63#else
64 msg.msg_control = (caddr_t)&cmsgbuf.buf;
65 msg.msg_controllen = sizeof(cmsgbuf.buf);

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

70 *(int *)CMSG_DATA(cmsg) = fd;
71#endif
72
73 vec.iov_base = &ch;
74 vec.iov_len = 1;
75 msg.msg_iov = &vec;
76 msg.msg_iovlen = 1;
77
78 while ((n = sendmsg(sock, &msg, 0)) == -1 && (errno == EAGAIN ||
79 errno == EINTR))
80 debug3("%s: sendmsg(%d): %s", __func__, fd, strerror(errno));
81 if (n == -1) {
82 error("%s: sendmsg(%d): %s", __func__, fd,
83 strerror(errno));
84 return -1;
85 }
86
87 if (n != 1) {
88 error("%s: sendmsg: expected sent 1 got %ld",

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

107 char buf[CMSG_SPACE(sizeof(int))];
108 } cmsgbuf;
109 struct cmsghdr *cmsg;
110#endif
111 struct iovec vec;
112 ssize_t n;
113 char ch;
114 int fd;
115
116 memset(&msg, 0, sizeof(msg));
117 vec.iov_base = &ch;
118 vec.iov_len = 1;
119 msg.msg_iov = &vec;
120 msg.msg_iovlen = 1;
121#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
122 msg.msg_accrights = (caddr_t)&fd;
123 msg.msg_accrightslen = sizeof(fd);
124#else
125 msg.msg_control = &cmsgbuf.buf;
126 msg.msg_controllen = sizeof(cmsgbuf.buf);
127#endif
128
129 while ((n = recvmsg(sock, &msg, 0)) == -1 && (errno == EAGAIN ||
130 errno == EINTR))
131 debug3("%s: recvmsg: %s", __func__, strerror(errno));
132 if (n == -1) {
133 error("%s: recvmsg: %s", __func__, strerror(errno));
134 return -1;
135 }
136
137 if (n != 1) {
138 error("%s: recvmsg: expected received 1 got %ld",
139 __func__, (long)n);

--- 30 unchanged lines hidden ---