386BSD 0.1 development

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

diff --git a/usr/src/usr.bin/talk/ctl.c b/usr/src/usr.bin/talk/ctl.c
index 2bd0a8c..3b8a1cb 100644 (file)
--- a/usr/src/usr.bin/talk/ctl.c
+++ b/usr/src/usr.bin/talk/ctl.c
@@ -1,12 +1,39 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * 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.c      5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)ctl.c      5.7 (Berkeley) 3/1/91";
+#endif /* not lint */

 
 /*
  * This file handles haggling with the various talk daemons to
 
 /*
  * This file handles haggling with the various talk daemons to


@@ -14,11 +41,16 @@ static char sccsid[] = "@(#)ctl.c   5.2 (Berkeley) %G%";
  * the progress
  */
 
  * the progress
  */
 

+#include <sys/types.h>
+#include <sys/socket.h>
+#include <protocols/talkd.h>
+#include <netinet/in.h>
+#include "talk.h"

 #include "talk_ctl.h"
 
 #include "talk_ctl.h"
 

-struct sockaddr_in daemon_addr = { AF_INET };
-struct sockaddr_in ctl_addr = { AF_INET };
-struct sockaddr_in my_addr = { AF_INET };
+struct sockaddr_in daemon_addr = { sizeof(daemon_addr), AF_INET };
+struct sockaddr_in ctl_addr = { sizeof(ctl_addr), AF_INET };
+struct sockaddr_in my_addr = { sizeof(my_addr), AF_INET };

 
        /* inet addresses of the two machines */
 struct in_addr my_machine_addr;
 
        /* inet addresses of the two machines */
 struct in_addr my_machine_addr;


@@ -41,10 +73,10 @@ open_sockt()
        sockt = socket(AF_INET, SOCK_STREAM, 0);
        if (sockt <= 0)
                p_error("Bad socket");
        sockt = socket(AF_INET, SOCK_STREAM, 0);
        if (sockt <= 0)
                p_error("Bad socket");

-       if (bind(sockt, &my_addr, sizeof(my_addr)) != 0)
+       if (bind(sockt, (struct sockaddr *)&my_addr, sizeof(my_addr)) != 0)

                p_error("Binding local socket");
        length = sizeof(my_addr);
                p_error("Binding local socket");
        length = sizeof(my_addr);

-       if (getsockname(sockt, &my_addr, &length) == -1)
+       if (getsockname(sockt, (struct sockaddr *)&my_addr, &length) == -1)

                p_error("Bad address for socket");
 }
 
                p_error("Bad address for socket");
 }
 


@@ -58,10 +90,12 @@ open_ctl()
        ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
        if (ctl_sockt <= 0)
                p_error("Bad socket");
        ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
        if (ctl_sockt <= 0)
                p_error("Bad socket");

-       if (bind(ctl_sockt, &ctl_addr, sizeof(ctl_addr), 0) != 0)
+       if (bind(ctl_sockt,
+           (struct sockaddr *)&ctl_addr, sizeof(ctl_addr)) != 0)

                p_error("Couldn't bind to control socket");
        length = sizeof(ctl_addr);
                p_error("Couldn't bind to control socket");
        length = sizeof(ctl_addr);

-       if (getsockname(ctl_sockt, &ctl_addr, &length) == -1)
+       if (getsockname(ctl_sockt,
+           (struct sockaddr *)&ctl_addr, &length) == -1)

                p_error("Bad address for ctl socket");
 }
 
                p_error("Bad address for ctl socket");
 }