From owner-p4-projects@FreeBSD.ORG Wed Oct 1 03:10:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19EB41065688; Wed, 1 Oct 2008 03:10:48 +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 C9EDF1065686 for ; Wed, 1 Oct 2008 03:10:47 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B850C8FC1A for ; Wed, 1 Oct 2008 03:10:47 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m913AlTU085245 for ; Wed, 1 Oct 2008 03:10:47 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m913Al3n085181 for perforce@freebsd.org; Wed, 1 Oct 2008 03:10:47 GMT (envelope-from rfrench@FreeBSD.org) Date: Wed, 1 Oct 2008 03:10:47 GMT Message-Id: <200810010310.m913Al3n085181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150737 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: Wed, 01 Oct 2008 03:10:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=150737 Change 150737 by rfrench@rfrench_mpls on 2008/10/01 03:10:33 Added the AF_MPLS type to socket.h I replaced AF_VENDOR00, which I hope was the right thing to do. Changed code to use this value as well as cleaned up the domain code. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#8 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#7 edit .. //depot/projects/soc2008/rfrench_mpls/sys/socket.h#2 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#8 (text+ko) ==== @@ -125,7 +125,7 @@ for (i = 0; i < mpls_inkloop; i++) { bzero(&sa_mpls, sizeof(sa_mpls)); smpls = &sa_mpls; - smpls->smpls_family = NETISR_MPLS; + smpls->smpls_family = AF_MPLS; smpls->smpls_len = sizeof(*smpls); smpls->smpls_in_ifindex = ifp->if_index; smpls->smpls_in_label = shim->shim_label & MPLS_LABEL_MASK; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#7 (text+ko) ==== @@ -75,11 +75,12 @@ }; struct domain mplsdomain = { - NETISR_MPLS, "mpls", mpls_init, 0, 0, - mplssw, - &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, - rn_inithead, - offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, + .dom_family = AF_MPLS, + .dom_name = "mpls", + .dom_protosw = mplssw, + .dom_protoswNPROTOSW = &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, + .dom_rtattach = rn_inithead, + .dom_rtoffset = offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, sizeof(struct sockaddr_mpls) }; ==== //depot/projects/soc2008/rfrench_mpls/sys/socket.h#2 (text+ko) ==== @@ -215,7 +215,7 @@ * even numbered constants for FreeBSD until 134 as odd numbered AF_ * constants 39-133 are now reserved for vendors. */ -#define AF_VENDOR00 39 +#define AF_MPLS 39 /* MPLS protocol family */ #define AF_VENDOR01 41 #define AF_VENDOR02 43 #define AF_VENDOR03 45