From owner-svn-src-user@FreeBSD.ORG  Mon Jan  5 12:58:46 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FD511065672;
	Mon,  5 Jan 2009 12:58:44 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DB9A8FC23;
	Mon,  5 Jan 2009 12:58:44 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n05Cwi5d096735;
	Mon, 5 Jan 2009 12:58:44 GMT (envelope-from piso@svn.freebsd.org)
Received: (from piso@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n05Cwic4096734;
	Mon, 5 Jan 2009 12:58:44 GMT (envelope-from piso@svn.freebsd.org)
Message-Id: <200901051258.n05Cwic4096734@svn.freebsd.org>
From: Paolo Pisati <piso@FreeBSD.org>
Date: Mon, 5 Jan 2009 12:58:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186771 - user/piso/sys/netinet/libalias
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 12:58:48 -0000

Author: piso
Date: Mon Jan  5 12:58:43 2009
New Revision: 186771
URL: http://svn.freebsd.org/changeset/base/186771

Log:
  get rid of the doxygen bits and reformat FindSctpRedirectAddress.

Modified:
  user/piso/sys/netinet/libalias/alias_db.c

Modified: user/piso/sys/netinet/libalias/alias_db.c
==============================================================================
--- user/piso/sys/netinet/libalias/alias_db.c	Mon Jan  5 12:39:10 2009	(r186770)
+++ user/piso/sys/netinet/libalias/alias_db.c	Mon Jan  5 12:58:43 2009	(r186771)
@@ -2901,37 +2901,29 @@ LibAliasSetSkinnyPort(struct libalias *l
 	LIBALIAS_UNLOCK(la);
 }
 
-/**
- * @brief Find the address to redirect incoming packets
- *
- * The function is located in alias_db.c due to calls to static functions
- *
- * 
- * @param la pointer to the libalias instance
- * @param sm pointer to the incoming message
- * 
- * @return address to redirect an incoming INIT to
+/*
+ * Find the address to redirect incoming packets
  */
 struct in_addr
 FindSctpRedirectAddress(struct libalias *la,  struct sctp_nat_msg *sm)
 {
-  struct alias_link *lnk;
-  struct in_addr redir;
+	struct alias_link *lnk;
+	struct in_addr redir;
 
-  LIBALIAS_LOCK_ASSERT(la);
-  lnk = FindLinkIn(la, sm->ip_hdr->ip_src, sm->ip_hdr->ip_dst,
-		    sm->sctp_hdr->dest_port,sm->sctp_hdr->dest_port, LINK_SCTP, 1);
-  if (lnk != NULL) {
-    return(lnk->src_addr); /* port redirect */
-  } else {
-    redir = FindOriginalAddress(la,sm->ip_hdr->ip_dst);
-    if (redir.s_addr == la->aliasAddress.s_addr ||
-	redir.s_addr == la->targetAddress.s_addr) { /* No address found */
-      lnk = FindLinkIn(la, sm->ip_hdr->ip_src, sm->ip_hdr->ip_dst,
-		     NO_DEST_PORT, 0, LINK_SCTP, 1);
-      if (lnk != NULL)
-	return(lnk->src_addr); /* redirect proto */
-    }
-    return(redir); /* address redirect */
-  }
+	LIBALIAS_LOCK_ASSERT(la);
+	lnk = FindLinkIn(la, sm->ip_hdr->ip_src, sm->ip_hdr->ip_dst,
+	    sm->sctp_hdr->dest_port,sm->sctp_hdr->dest_port, LINK_SCTP, 1);
+	if (lnk != NULL) {
+		return(lnk->src_addr); /* port redirect */
+	} else {
+		redir = FindOriginalAddress(la,sm->ip_hdr->ip_dst);
+		if (redir.s_addr == la->aliasAddress.s_addr ||
+		    redir.s_addr == la->targetAddress.s_addr) { /* No address found */
+			lnk = FindLinkIn(la, sm->ip_hdr->ip_src, sm->ip_hdr->ip_dst,
+			    NO_DEST_PORT, 0, LINK_SCTP, 1);
+			if (lnk != NULL)
+				return(lnk->src_addr); /* redirect proto */
+		}
+		return(redir); /* address redirect */
+	}
 }