From owner-p4-projects@FreeBSD.ORG Thu Feb 15 17:53:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 765EC16A408; Thu, 15 Feb 2007 17:53:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 339FD16A400 for ; Thu, 15 Feb 2007 17:53:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2373D13C461 for ; Thu, 15 Feb 2007 17:53:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FHra5M041285 for ; Thu, 15 Feb 2007 17:53:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FHrZoj041282 for perforce@freebsd.org; Thu, 15 Feb 2007 17:53:35 GMT (envelope-from piso@freebsd.org) Date: Thu, 15 Feb 2007 17:53:35 GMT Message-Id: <200702151753.l1FHrZoj041282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2007 17:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=114569 Change 114569 by piso@piso_newluxor on 2007/02/15 17:52:53 don't pass down maxpacketsize if we don't use it. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#18 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#18 (text+ko) ==== @@ -129,8 +129,7 @@ #define TFTP_PORT_NUMBER 69 static void -AliasHandleRtspOut(struct libalias *, pkt_t ptr, struct alias_link *, - int maxpacketsize); +AliasHandleRtspOut(struct libalias *, pkt_t ptr, struct alias_link *); static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { @@ -138,8 +137,7 @@ if (ah->dport != NULL && ah->aport != NULL && ah->sport != NULL && ntohs(*ah->dport) == TFTP_PORT_NUMBER) return (0); - if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || - ah->maxpktsize == 0) + if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) return (-1); if (ntohs(*ah->dport) == RTSP_CONTROL_PORT_NUMBER_1 || ntohs(*ah->sport) == RTSP_CONTROL_PORT_NUMBER_1 @@ -160,7 +158,7 @@ return (-1); FindRtspOut(la, pip->ip_src, pip->ip_dst, *ah->sport, *ah->aport, IPPROTO_UDP); - } else AliasHandleRtspOut(la, ptr, ah->lnk, ah->maxpktsize); + } else AliasHandleRtspOut(la, ptr, ah->lnk); return (0); } @@ -481,7 +479,7 @@ } static void -AliasHandleRtspOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk, int maxpacketsize) +AliasHandleRtspOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk) { int hlen, tlen, dlen; struct ip *pip; @@ -492,8 +490,6 @@ const char *server_port_str = "server_port"; int i, parseOk; - (void)maxpacketsize; - PULLUP_TCPHDR(pip, ptr); if (pip == NULL) return;