386BSD 0.1 development

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

diff --git a/usr/src/usr.bin/talk/look_up.c b/usr/src/usr.bin/talk/look_up.c
index 0a97bda..4913856 100644 (file)
--- a/usr/src/usr.bin/talk/look_up.c
+++ b/usr/src/usr.bin/talk/look_up.c
@@ -1,14 +1,47 @@
 /*
  * 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[] = "@(#)look_up.c  5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)look_up.c  5.7 (Berkeley) 3/1/91";
+#endif /* not lint */

 
 

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

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

+#include "talk.h"

 
 /*
  * See if the local daemon has an invitation for us.
 
 /*
  * See if the local daemon has an invitation for us.


@@ -19,8 +52,13 @@ check_local()
        register CTL_RESPONSE *rp = &response;
 
        /* the rest of msg was set up in get_names */
        register CTL_RESPONSE *rp = &response;
 
        /* the rest of msg was set up in get_names */

+#ifdef MSG_EOR
+       /* copy new style sockaddr to old, swap family (short in old) */
+       msg.ctl_addr = *(struct osockaddr *)&ctl_addr;
+       msg.ctl_addr.sa_family = htons(ctl_addr.sin_family);
+#else

        msg.ctl_addr = *(struct sockaddr *)&ctl_addr;
        msg.ctl_addr = *(struct sockaddr *)&ctl_addr;

-       msg.ctl_addr.sa_family = htons(msg.ctl_addr.sa_family);
+#endif

        /* must be initiating a talk */
        if (!look_for_invite(rp))
                return (0);
        /* must be initiating a talk */
        if (!look_for_invite(rp))
                return (0);


@@ -33,7 +71,8 @@ check_local()
                if (rp->addr.sa_family != AF_INET)
                        p_error("Response uses invalid network address");
                errno = 0;
                if (rp->addr.sa_family != AF_INET)
                        p_error("Response uses invalid network address");
                errno = 0;

-               if (connect(sockt, &rp->addr, sizeof (rp->addr)) != -1)
+               if (connect(sockt,
+                   (struct sockaddr *)&rp->addr, sizeof (rp->addr)) != -1)

                        return (1);
        } while (errno == EINTR);
        if (errno == ECONNREFUSED) {
                        return (1);
        } while (errno == EINTR);
        if (errno == ECONNREFUSED) {