PERFORCE change 181473 for review

[Sergio Ligregni]

http://p4web.freebsd.org/@@181473?ac=10

Change 181473 by ligregni at 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 <arpa/inet.h>
 
+/*** 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 <arpa/inet.h>
 
+/* 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) ====