BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / amd / rpc_fwd.c

diff --git a/usr/src/usr.sbin/amd/amd/rpc_fwd.c b/usr/src/usr.sbin/amd/amd/rpc_fwd.c
index 1911bd5..957660f 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/rpc_fwd.c
+++ b/usr/src/usr.sbin/amd/amd/rpc_fwd.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: rpc_fwd.c,v 5.2 90/06/23 22:19:57 jsp Rel $
- *

  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.
  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.


@@ -9,21 +7,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * 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.
+ *
+ *     @(#)rpc_fwd.c   5.3 (Berkeley) 5/12/91
+ *
+ * $Id: rpc_fwd.c,v 5.2.1.3 91/05/07 22:18:30 jsp Alpha $

  *
  *

- *     @(#)rpc_fwd.c   5.1 (Berkeley) 6/29/90

  */
 
 /*
  */
 
 /*


@@ -146,7 +161,7 @@ rpc_forward *p;
 #ifdef DEBUG
        /*dlog("fwd_free: rpc_head = %#x", rpc_head.q_forw);*/
 #endif /* DEBUG */
 #ifdef DEBUG
        /*dlog("fwd_free: rpc_head = %#x", rpc_head.q_forw);*/
 #endif /* DEBUG */

-       free(p);
+       free((voidp) p);

 }
 
 /*
 }
 
 /*


@@ -278,7 +293,9 @@ fwd_fun cb;
         * rest of "p" otherwise nasty things happen later...
         */
 #ifdef DEBUG
         * rest of "p" otherwise nasty things happen later...
         */
 #ifdef DEBUG

-       dlog("Sending packet id %#x to %#08x.%04x", p->rf_xid, ntohl(fwdto->sin_addr.s_addr), ntohs(fwdto->sin_port));
+       { char dq[20]; 
+       dlog("Sending packet id %#x to %s.%d", p->rf_xid, inet_dquad(dq, fwdto->sin_addr.s_addr), ntohs(fwdto->sin_port));
+       }

 #endif /* DEBUG */
        if (sendto(fwd_sock, (char *) pkt, len, 0,
                        (struct sockaddr *) fwdto, sizeof(*fwdto)) < 0)
 #endif /* DEBUG */
        if (sendto(fwd_sock, (char *) pkt, len, 0,
                        (struct sockaddr *) fwdto, sizeof(*fwdto)) < 0)


@@ -395,7 +412,7 @@ again:
                /*
                 * Call forwarding function
                 */
                /*
                 * Call forwarding function
                 */

-               (*p->rf_fwd)(pkt, rc, &src_addr, &p->rf_sin, p->rf_ptr, TRUE);
+               (*p->rf_fwd)((voidp) pkt, rc, &src_addr, &p->rf_sin, p->rf_ptr, TRUE);

        }
 
        /*
        }
 
        /*


@@ -408,6 +425,6 @@ out:;
        /*
         * Free the packet
         */
        /*
         * Free the packet
         */

-       free(pkt);
+       free((voidp) pkt);

 #endif /* DYNAMIC_BUFFERS */
 }
 #endif /* DYNAMIC_BUFFERS */
 }