From owner-p4-projects@FreeBSD.ORG Sat Jul 21 22:33:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3CA816A419; Sat, 21 Jul 2007 22:33:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B694216A46E for ; Sat, 21 Jul 2007 22:33:34 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2C2D13C45A for ; Sat, 21 Jul 2007 22:33:34 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6LMXYPZ037405 for ; Sat, 21 Jul 2007 22:33:34 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LMXYsT037402 for perforce@freebsd.org; Sat, 21 Jul 2007 22:33:34 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 22:33:34 GMT Message-Id: <200707212233.l6LMXYsT037402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123869 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: Sat, 21 Jul 2007 22:33:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=123869 Change 123869 by fli@fli_nexus on 2007/07/21 22:32:48 Ops, the timeout struct member seems to have been misplaced in the query message. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/shared/mdnsd_clipkg.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/shared/mdnsd_clipkg.h#2 (text+ko) ==== @@ -103,19 +103,19 @@ * wide character encoded domain name. * Direction: Client -> Server * - * 0 7 15 23 24 47 63 79 95 - * +----+----+----+-+-----------+--------+--------+--------+----//----+ - * |cmd |len |fam |a| ifidx | tout | class | type | name | - * +----+----+----+-+-----------+--------+--------+--------+----//----+ + * 0 7 15 31 39 63 79 95 + * +----+----+--------+----+------------+--------+--------+---//---+ + * |cmd |len |timeout |fam | ifidx | class | type | name | + * +----+----+--------+----+------------+--------+--------+---//---+ * * `cmd' - is the query type which is defined as follows * 1 = oneshot query * 2 = register a continuous query * 3 = deregister a continuous query * `len' - The length of the domain name in characters, not bytes. + * `timeout' - Timeout in seconds before giving up (oneshot only) * `ifany' - If set, do the query on all active interfaces * `ifidx' - If `ifany' is zero, this specifies the inteface index - * `timeout' - Timeout in seconds before giving up (oneshot only) * `class' - Should contain the desired class, or mdns_c_any * `type' - Should contain the desired type or mdns_t_any * `name' - Wide character encoded (wchar_t) domain name @@ -142,9 +142,9 @@ struct cp_query { uint8_t cpq_cmd; /* query command */ uint8_t cpq_len; /* query name length in characters */ + uint16_t cpq_timeout; /* timeout in seconds (oneshot only) */ unsigned int cpq_fam:8; /* address family to query */ unsigned int cpq_ifidx:24; /* interface index, 0 = all ifs */ - uint16_t cpq_timeout; /* timeout in seconds (oneshot only) */ uint16_t cpq_class; /* query class */ uint16_t cpq_type; /* query type */ /* Query name follows */