From owner-p4-projects@FreeBSD.ORG Mon Jul 27 11:33:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 394431065679; Mon, 27 Jul 2009 11:33:17 +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 ED4401065676 for ; Mon, 27 Jul 2009 11:33:16 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DBB018FC1A for ; Mon, 27 Jul 2009 11:33:16 +0000 (UTC) (envelope-from jona@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 n6RBXG4P062626 for ; Mon, 27 Jul 2009 11:33:16 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6RBXGos062624 for perforce@freebsd.org; Mon, 27 Jul 2009 11:33:16 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 27 Jul 2009 11:33:16 GMT Message-Id: <200907271133.n6RBXGos062624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Cc: Subject: PERFORCE change 166612 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: Mon, 27 Jul 2009 11:33:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=166612 Change 166612 by jona@jona-trustedbsd-belle-vmware on 2009/07/27 11:32:34 Implemented ua_powerbox() Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#11 (text+ko) ==== @@ -324,6 +324,53 @@ } +int ua_powerbox(struct ua_powerbox_options *options, + int fds[], char *names[], int *len) +{ + if(angel < 0) angel = ua_find(); + if(angel < 0) return -1; + + struct ua_datum *data[2]; + data[0] = ua_marshall_int(UA_POWERBOX); + data[1] = ua_marshall_powerbox(options); + + for(int i = 0; i < 2; i++) + { + if(ua_send(angel, data[i], NULL, 0) < 0) return -1; + free(data[i]); + } + + + // retrieve the file descriptor(s) + struct ua_datum *fdcountd = ua_recv(angel, NULL, NULL); + if(!fdcountd) return -1; + + if(ua_unmarshall_int(fdcountd, len) < 0) return -1; + + uint32_t fdcount = *len; + int32_t fdarray[fdcount]; + + struct ua_datum *fd_datum = ua_recv(angel, fdarray, &fdcount); + if(!fd_datum) return -1; + *len = fdcount; + + int buflen = 1024; + char buffer[buflen]; + for(unsigned int i = 0; i < fdcount; i++) + { + fds[i] = fdarray[i]; + + int namelen = buflen; + if(ua_unmarshall_string(fd_datum, buffer, &namelen) < 0) return -1; + + names[i] = (char*) malloc(namelen); + memcpy(names[i], buffer, namelen); + } + + return 0; +} + + int ua_send(int sock, datum *d, int32_t fds[], int32_t fdlen) {