From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A4341066337; Wed, 28 Jul 2010 08:21:38 +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 E40431065743 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02BB28FC1D for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaqQ009177 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LaAL009175 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8LaAL009175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181473 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, 28 Jul 2010 08:21:47 -0000 http://p4web.freebsd.org/@@181473?ac=10 Change 181473 by ligregni@ligPhenom on 2010/07/27 02:45:53 Many trail directories Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.c#6 edit .. //depot/projects/soc2010/disaudit/msocket_work.c#6 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#6 edit .. //depot/projects/soc2010/disaudit/shipd.c#9 edit .. //depot/projects/soc2010/disaudit/ssocket_work.c#7 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#7 edit .. //depot/projects/soc2010/disaudit/utils.c#2 edit .. //depot/projects/soc2010/disaudit/utils.h#2 edit Differences ... ==== //depot/projects/soc2010/disaudit/damasterd.c#6 (text+ko) ==== @@ -56,8 +56,8 @@ /*** DECLARATIONS ***/ /* local prototypes */ -static int check_files_equal(char *pathslave, char *md5slave, char *hostname, - char *path, char *fullpath); +static int check_files_equal(char *pathslave, char *sha256slave, + char *hostname, char *path, char *fullpath); static int do_master_daemon(); static int get_parameters(); static int process_request(int sfd, struct sockaddr *clientinfo); ==== //depot/projects/soc2010/disaudit/msocket_work.c#6 (text+ko) ==== @@ -40,6 +40,12 @@ #include +/*** DECLARATIONS ***/ + +/* local prototypes */ +int init_socket(int); +int accept_connection(int, struct sockaddr *); + int init_socket(int port) { ==== //depot/projects/soc2010/disaudit/msocket_work.h#6 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/shipd.c#9 (text+ko) ==== @@ -63,6 +63,12 @@ struct s_trail_entry *next; } trail_entry; +/* Directory entries */ +typedef struct s_audit_dir_entry +{ + char path[MAX_DIR_SIZE+1]; +} audit_dir_entry; + /* Directory settings took from audit_control */ char audit_trails_dir[MAX_DIR_SIZE + 1]; char master_host[MAX_HOST_SIZE + 1]; ==== //depot/projects/soc2010/disaudit/ssocket_work.c#7 (text+ko) ==== @@ -44,6 +44,14 @@ #include +/* DECLARATIONS */ + +/* local prototypes */ +int do_socket_check_file(int sockfd, char *path, char *sha256); +int do_socket_send_file(int sockfd, char *path, char *fullpath); +int is_ipv4(char *address); + + int do_socket_check_file(int sockfd, char *path, char *sha256) { ==== //depot/projects/soc2010/disaudit/ssocket_work.h#7 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/utils.c#2 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/utils.h#2 (text+ko) ====