From owner-p4-projects@FreeBSD.ORG Wed Dec 2 11:13:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3EBF1065679; Wed, 2 Dec 2009 11:13:06 +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 73C341065672 for ; Wed, 2 Dec 2009 11:13:06 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FD3C8FC21 for ; Wed, 2 Dec 2009 11:13:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB2BD66o022545 for ; Wed, 2 Dec 2009 11:13:06 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2BD6Im022543 for perforce@freebsd.org; Wed, 2 Dec 2009 11:13:06 GMT (envelope-from marinosi@FreeBSD.org) Date: Wed, 2 Dec 2009 11:13:06 GMT Message-Id: <200912021113.nB2BD6Im022543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 11:13:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=171262 Change 171262 by marinosi@revolver on 2009/12/02 11:12:24 Resolved items during Integrate. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ifnet.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/systrace_args.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.h#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/sysproto.h#5 integrate Differences ... ==== //depot/projects/soc2009/marinosi_appaudit/src/contrib/ntp/ntpd/ntp_io.c#2 (text+ko) ==== @@ -65,6 +65,12 @@ #endif /* IPV6 Multicast Support */ #endif /* IPv6 Support */ +#ifdef INCLUDE_IPV6_SUPPORT +#include +#include +#include +#endif /* !INCLUDE_IPV6_SUPPORT */ + extern int listen_to_virtual_ips; extern const char *specific_interface; @@ -1137,6 +1143,36 @@ } #endif /* OS_NEEDS_REUSEADDR_FOR_IFADDRBIND */ +#ifdef INCLUDE_IPV6_SUPPORT +static isc_boolean_t +is_anycast(struct sockaddr *sa, char *name) +{ +#if defined(SIOCGIFAFLAG_IN6) && defined(IN6_IFF_ANYCAST) + struct in6_ifreq ifr6; + int fd; + u_int32_t flags6; + + if (sa->sa_family != AF_INET6) + return ISC_FALSE; + if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) + return ISC_FALSE; + memset(&ifr6, 0, sizeof(ifr6)); + memcpy(&ifr6.ifr_addr, (struct sockaddr_in6 *)sa, + sizeof(struct sockaddr_in6)); + strlcpy(ifr6.ifr_name, name, IF_NAMESIZE); + if (ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) < 0) { + close(fd); + return ISC_FALSE; + } + close(fd); + flags6 = ifr6.ifr_ifru.ifru_flags6; + if ((flags6 & IN6_IFF_ANYCAST) != 0) + return ISC_TRUE; +#endif /* !SIOCGIFAFLAG_IN6 || !IN6_IFF_ANYCAST */ + return ISC_FALSE; +} +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * update_interface strategy * @@ -1276,6 +1312,11 @@ if (is_wildcard_addr(&interface.sin)) continue; +#ifdef INCLUDE_IPV6_SUPPORT + if (is_anycast((struct sockaddr *)&interface.sin, isc_if.name)) + continue; +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * map to local *address* in order * to map all duplicate interfaces to an interface structure ==== //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/printf.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.63 2009/03/04 03:38:51 das Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.64 2009/12/02 07:51:25 brueffer Exp $ .\" -.Dd March 3, 2009 +.Dd December 2, 2009 .Dt PRINTF 3 .Os .Sh NAME @@ -55,7 +55,7 @@ .Ft int .Fn asprintf "char **ret" "const char *format" ... .Ft int -.Fn dprintf "int" "const char * restrict format" ... +.Fn dprintf "int fd" "const char * restrict format" ... .In stdarg.h .Ft int .Fn vprintf "const char * restrict format" "va_list ap" ==== //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ifnet.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.54 2008/12/11 22:51:11 kmacy Exp $ +.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.55 2009/12/01 14:56:00 bz Exp $ .\" -.Dd March 14, 2007 +.Dd December 1, 2009 .Os .Dt IFNET 9 .Sh NAME @@ -279,13 +279,6 @@ .Xr link_addr 3 ) . (Initialized by .Fn if_alloc . ) -.It Va if_timer -.Pq Vt short -Number of seconds until the watchdog timer -.Fn if_watchdog -is called, or zero if the timer is disabled. -(Set by driver, -decremented by generic watchdog code.) .It Va if_flags .Pq Vt int Flags describing operational parameters of this interface (see below). @@ -401,11 +394,6 @@ See the description of .Fn ifioctl below for more information. -.It Fn if_watchdog -Routine called by the generic code when the watchdog timer, -.Va if_timer , -expires. -Usually this will reset the interface. .\" .It Fn if_poll_recv .\" .It Fn if_poll_xmit .\" .It Fn if_poll_slowinput @@ -415,7 +403,7 @@ .\" section, below. .It Fn if_init Initialize and bring up the hardware, -e.g., reset the chip and the watchdog timer and enable the receiver unit. +e.g., reset the chip and enable the receiver unit. Should mark the interface running, but not active .Dv ( IFF_RUNNING , ~IIF_OACTIVE ) . ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/AVILA#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.33 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.34 2009/12/02 00:38:11 thompsa Exp $ ident AVILA @@ -132,6 +132,7 @@ device ath_ar5416 options AH_SUPPORT_AR5416 device ath_ar9160 +device ath_ar9280 device usb #options USB_DEBUG ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/CAMBRIA#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.15 2009/12/02 00:37:03 thompsa Exp $ ident CAMBRIA @@ -135,11 +135,8 @@ # #device ath_ar5416 #options AH_SUPPORT_AR5416 # NB: for 11n descriptor format -#device ath_rf2133 #device ath_ar9160 #device ath_ar9280 -#device ath_rf9280 -#device ath_ar9285 # NB: 2 USB 2.0 ports standard device usb ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.123 2009/07/08 16:26:43 trasz Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.125 2009/10/27 10:55:34 kib Exp */ const char *freebsd32_syscallnames[] = { @@ -521,6 +521,15 @@ "freebsd32_msgctl", /* 511 = freebsd32_msgctl */ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */ "lpathconf", /* 513 = lpathconf */ - "auditon", /* 514 = auditon */ - "auditctl_slice", /* 515 = auditctl_slice */ + "#514", /* 514 = cap_new */ + "#515", /* 515 = cap_getrights */ + "#516", /* 516 = cap_enter */ + "#517", /* 517 = cap_getmode */ + "#518", /* 518 = pdfork */ + "#519", /* 519 = pdkill */ + "#520", /* 520 = pdgetpid */ + "#521", /* 521 = pdwait */ + "freebsd32_pselect", /* 522 = freebsd32_pselect */ + "auditon", /* 523 = auditon */ + "auditctl_slice", /* 524 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.123 2009/07/08 16:26:43 trasz Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.125 2009/10/27 10:55:34 kib Exp */ #include "opt_compat.h" @@ -558,6 +558,15 @@ { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 511 = freebsd32_msgctl */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 512 = freebsd32_shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 514 = auditon */ - { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 515 = auditctl_slice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ + { AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, AUE_SELECT, NULL, 0, 0, 0 }, /* 522 = freebsd32_pselect */ + { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 523 = auditon */ + { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 524 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_x86.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.12 2009/08/14 21:05:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.13 2009/12/01 21:54:53 emaste Exp $"); #include #include @@ -101,7 +101,7 @@ if (copyin((void *) sp, &pc, sizeof(pc)) != 0) return (n); } else if (copyin((void *) r, &pc, sizeof(pc)) != 0 || - copyin((void *) fp, &fp, sizeof(fp) != 0)) + copyin((void *) fp, &fp, sizeof(fp)) != 0) return (n); for (; n < nframes;) { ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/init_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.255 2009/10/27 11:01:15 kib Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 198508 2009-10-27 10:55:34Z kib */ #include "opt_compat.h" @@ -548,6 +548,13 @@ { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 511 = msgctl */ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 512 = shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { AS(auditon_slice_args), (sy_call_t *)auditon_slice, AUE_AUDITON, NULL, 0, 0, 0 }, /* 514 = auditon_slice */ - { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 515 = auditctl_slice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ + { AS(pselect_args), (sy_call_t *)pselect, AUE_SELECT, NULL, 0, 0, 0 }, /* 522 = pselect */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/syscalls.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp */ const char *syscallnames[] = { @@ -521,6 +521,15 @@ "msgctl", /* 511 = msgctl */ "shmctl", /* 512 = shmctl */ "lpathconf", /* 513 = lpathconf */ - "auditon_slice", /* 514 = auditon_slice */ - "auditctl_slice", /* 515 = auditctl_slice */ + "#514", /* 514 = cap_new */ + "#515", /* 515 = cap_getrights */ + "#516", /* 516 = cap_enter */ + "#517", /* 517 = cap_getmode */ + "#518", /* 518 = pdfork */ + "#519", /* 519 = pdkill */ + "#520", /* 520 = pdgetpid */ + "#521", /* 521 = pdwait */ + "pselect", /* 522 = pselect */ + "auditon_slice", /* 523 = auditon_slice */ + "auditctl_slice", /* 524 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/systrace_args.c#5 (text+ko) ==== @@ -3072,8 +3072,20 @@ *n_args = 2; break; } + /* pselect */ + case 522: { + struct pselect_args *p = params; + iarg[0] = p->nd; /* int */ + uarg[1] = (intptr_t) p->in; /* fd_set * */ + uarg[2] = (intptr_t) p->ou; /* fd_set * */ + uarg[3] = (intptr_t) p->ex; /* fd_set * */ + uarg[4] = (intptr_t) p->ts; /* const struct timespec * */ + uarg[5] = (intptr_t) p->sm; /* const sigset_t * */ + *n_args = 6; + break; + } /* auditon_slice */ - case 514: { + case 523: { struct auditon_slice_args *p = params; iarg[0] = p->cmd; /* int */ uarg[1] = (intptr_t) p->name; /* char * */ @@ -3083,7 +3095,7 @@ break; } /* auditctl_slice */ - case 515: { + case 524: { struct auditctl_slice_args *p = params; uarg[0] = (intptr_t) p->as_name; /* char * */ uarg[1] = (intptr_t) p->path; /* char * */ @@ -8172,8 +8184,33 @@ break; }; break; + /* pselect */ + case 522: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "fd_set *"; + break; + case 2: + p = "fd_set *"; + break; + case 3: + p = "fd_set *"; + break; + case 4: + p = "const struct timespec *"; + break; + case 5: + p = "const sigset_t *"; + break; + default: + break; + }; + break; /* auditon_slice */ - case 514: + case 523: switch(ndx) { case 0: p = "int"; @@ -8192,7 +8229,7 @@ }; break; /* auditctl_slice */ - case 515: + case 524: switch(ndx) { case 0: p = "char *"; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.133 2009/08/21 11:20:10 julian Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.134 2009/12/02 08:52:06 luigi Exp $ */ #ifndef _IPFW2_H @@ -237,7 +237,7 @@ * */ typedef struct _ipfw_insn { /* template for instructions */ - enum ipfw_opcodes opcode:8; + u_int8_t opcode; u_int8_t len; /* number of 32-bit words */ #define F_NOT 0x80 #define F_OR 0x40 ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/powerpc/include/vmparam.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: vmparam.h,v 1.11 2000/02/11 19:25:16 thorpej Exp $ - * $FreeBSD: src/sys/powerpc/include/vmparam.h,v 1.14 2009/04/21 17:08:02 marcel Exp $ + * $FreeBSD: src/sys/powerpc/include/vmparam.h,v 1.15 2009/12/02 06:49:22 nwhitehorn Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -38,23 +38,23 @@ #define USRSTACK VM_MAXUSER_ADDRESS #ifndef MAXTSIZ -#define MAXTSIZ (16*1024*1024) /* max text size */ +#define MAXTSIZ (64*1024*1024) /* max text size */ #endif #ifndef DFLDSIZ -#define DFLDSIZ (32*1024*1024) /* default data size */ +#define DFLDSIZ (128*1024*1024) /* default data size */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (512*1024*1024) /* max data size */ +#define MAXDSIZ (1*1024*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ -#define DFLSSIZ (1*1024*1024) /* default stack size */ +#define DFLSSIZ (8*1024*1024) /* default stack size */ #endif #ifndef MAXSSIZ -#define MAXSSIZ (32*1024*1024) /* max stack size */ +#define MAXSSIZ (64*1024*1024) /* max stack size */ #endif /* ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp */ #define SYS_syscall 0 @@ -428,6 +428,7 @@ #define SYS_msgctl 511 #define SYS_shmctl 512 #define SYS_lpathconf 513 -#define SYS_auditon_slice 514 -#define SYS_auditctl_slice 515 -#define SYS_MAXSYSCALL 516 +#define SYS_pselect 522 +#define SYS_auditon_slice 523 +#define SYS_auditctl_slice 524 +#define SYS_MAXSYSCALL 525 ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp MIASM = \ syscall.o \ exit.o \ @@ -377,5 +377,6 @@ msgctl.o \ shmctl.o \ lpathconf.o \ + pselect.o \ auditon_slice.o \ auditctl_slice.o ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/sysproto.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1641,6 +1641,14 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; }; +struct pselect_args { + char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; + char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)]; + char ou_l_[PADL_(fd_set *)]; fd_set * ou; char ou_r_[PADR_(fd_set *)]; + char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)]; + char ts_l_[PADL_(const struct timespec *)]; const struct timespec * ts; char ts_r_[PADR_(const struct timespec *)]; + char sm_l_[PADL_(const sigset_t *)]; const sigset_t * sm; char sm_r_[PADR_(const sigset_t *)]; +}; struct auditon_slice_args { char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; @@ -2009,6 +2017,7 @@ int msgctl(struct thread *, struct msgctl_args *); int shmctl(struct thread *, struct shmctl_args *); int lpathconf(struct thread *, struct lpathconf_args *); +int pselect(struct thread *, struct pselect_args *); int auditon_slice(struct thread *, struct auditon_slice_args *); int auditctl_slice(struct thread *, struct auditctl_slice_args *); @@ -2683,6 +2692,7 @@ #define SYS_AUE_msgctl AUE_MSGCTL #define SYS_AUE_shmctl AUE_SHMCTL #define SYS_AUE_lpathconf AUE_LPATHCONF +#define SYS_AUE_pselect AUE_SELECT #define SYS_AUE_auditon_slice AUE_AUDITON #define SYS_AUE_auditctl_slice AUE_AUDITCTL