386BSD 0.1 development

[unix-history] / usr / src / usr.bin / talk / ctl_transact.c

diff --git a/usr/src/usr.bin/talk/ctl_transact.c b/usr/src/usr.bin/talk/ctl_transact.c
index 7b63831..b5c1975 100644 (file)
--- a/usr/src/usr.bin/talk/ctl_transact.c
+++ b/usr/src/usr.bin/talk/ctl_transact.c
@@ -2,27 +2,46 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ctl_transact.c     5.7 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)ctl_transact.c     5.8 (Berkeley) 3/1/91";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include "talk_ctl.h"
+#include <sys/types.h>
+#include <sys/socket.h>

 #include <sys/time.h>
 #include <sys/time.h>

+#include <netinet/in.h>
+#include <protocols/talkd.h>
+#include <errno.h>
+#include "talk_ctl.h"

 
 #define CTL_WAIT 2     /* time to wait for a response, in seconds */
 
 
 #define CTL_WAIT 2     /* time to wait for a response, in seconds */
 


@@ -55,7 +74,8 @@ ctl_transact(target, msg, type, rp)
                /* resend message until a response is obtained */
                do {
                        cc = sendto(ctl_sockt, (char *)&msg, sizeof (msg), 0,
                /* resend message until a response is obtained */
                do {
                        cc = sendto(ctl_sockt, (char *)&msg, sizeof (msg), 0,

-                               &daemon_addr, sizeof (daemon_addr));
+                           (struct sockaddr *)&daemon_addr,
+                           sizeof (daemon_addr));

                        if (cc != sizeof (msg)) {
                                if (errno == EINTR)
                                        continue;
                        if (cc != sizeof (msg)) {
                                if (errno == EINTR)
                                        continue;