Date: Wed Feb 19 21:40:30 CET 2003
User: Derick Rethans
Directory: srm/modules/skeleton
Log Message:
[0.25]
- Include files cleanup
Deleted files:
srm/main/srm_com.h (last version: 1.13)
Modified files:
srm/main/Makefile.am (version: 1.13)
srm/main/main.c (version: 1.71)
srm/main/src/functions.c (version: 1.32)
srm/main/src/srm_client.c (version: 1.18)
srm/main/src/srm_client.h (version: 1.29)
srm/main/src/srm_compat.c (version: 1.19)
srm/main/src/srm_error.c (version: 1.31)
srm/main/src/srm_error.h (version: 1.2)
srm/main/src/srm_protocol_standard.h (version: 1.27)
srm/main/src/srm_protocols.c (version: 1.7)
srm/main/src/srm_queue.c (version: 1.6)
srm/main/src/storage.c (version: 1.21)
srm/modules/skeleton/skeleton.c (version: 1.6)
[FILE: /srm/main/Makefile.am]
--- srm/main/Makefile.am:1.12 Mon Jan 14 18:53:51 2002 GMT
+++ srm/main/Makefile.am Wed Feb 19 19:40:26 2003 GMT
@@ -1,4 +1,4 @@
-## $Id: cvstemp,v 1.12 2002/01/14 19:53:51 peter Exp $
+## $Id: cvstemp,v 1.13 2003/02/19 20:40:26 derick Exp $
##
## The contents of this file are subject to the Vulcan Logic Public
@@ -26,4 +26,4 @@
sbin_PROGRAMS = srmd
srmd_SOURCES = main.c internal_functions.c
LDADD = $(top_srcdir)/main/src/libsrm.a @SRM_STATIC_LDADD@
-include_HEADERS = srm_com.h srm_config.h
+include_HEADERS = srm_config.h
[FILE: /srm/main/main.c]
--- srm/main/main.c:1.70 Wed Feb 19 19:15:52 2003 GMT
+++ srm/main/main.c Wed Feb 19 19:40:26 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.70 2003/02/19 20:15:52 derick Exp $ */
+/* $Id: cvstemp,v 1.71 2003/02/19 20:40:26 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -25,19 +25,15 @@
#include <stdio.h>
#include <pthread.h>
#include <sys/socket.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <sys/un.h>
-#include <netdb.h>
-#include <stdlib.h>
#include <signal.h>
#include "config.h"
#include "srm_compat.h"
#include "srm_config.h"
-#include "functions.h"
#include "ini_parser.h"
#include "srm_modules.h"
#include "srm_protocols.h"
[FILE: /srm/main/src/functions.c]
--- srm/main/src/functions.c:1.31 Sun Feb 16 12:02:18 2003 GMT
+++ srm/main/src/functions.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.31 2003/02/16 13:02:18 derick Exp $ */
+/* $Id: cvstemp,v 1.32 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -20,7 +20,6 @@
* Derick Rethans <d.rethans@jdimedia.nl>
*/
-#include <stdio.h>
#include <stdlib.h>
#include "srm_config.h"
[FILE: /srm/main/src/srm_client.c]
--- srm/main/src/srm_client.c:1.17 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_client.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.17 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.18 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -21,22 +21,15 @@
* Derick Rethans <d.rethans@jdimedia.nl>
*/
-#include <stdio.h>
#include <stdlib.h>
-#include <stdarg.h>
#include <unistd.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <netinet/in.h>
#include <netdb.h>
-#include <string.h>
-#include <errno.h>
#include "srm_client.h"
#include "srm_config.h"
-#include "srm_com.h"
-#include "srm_value.h"
+#include "srm_protocol_standard.h"
#define COM_ERROR_CREATE_SOCKET_STR "Cannot create socket: %s"
#define COM_ERROR_GET_HOSTNAME_STR "Couldn't resolve hostname: %s"
[FILE: /srm/main/src/srm_client.h]
--- srm/main/src/srm_client.h:1.28 Sun Feb 16 12:02:19 2003 GMT
+++ srm/main/src/srm_client.h Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.28 2003/02/16 13:02:19 derick Exp $ */
+/* $Id: cvstemp,v 1.29 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -24,7 +24,7 @@
#define __SRM_CLIENT_H__
#include "functions.h"
-#include "srm_com.h"
+#include "srm_protocol_standard.h"
#include "srm_compat.h"
#include "srm_config.h"
#include "srm_hash.h"
[FILE: /srm/main/src/srm_compat.c]
--- srm/main/src/srm_compat.c:1.18 Sun Feb 16 12:02:19 2003 GMT
+++ srm/main/src/srm_compat.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.18 2003/02/16 13:02:19 derick Exp $ */
+/* $Id: cvstemp,v 1.19 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -33,9 +33,7 @@
#include <unistd.h>
#include "config.h"
-#include "srm_modules.h"
#include "srm_config.h"
-#include "srm_value.h"
char *srm_gethostbyaddr (const struct in_addr *addr, int len, int type)
{
[FILE: /srm/main/src/srm_error.c]
--- srm/main/src/srm_error.c:1.30 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_error.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.30 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.31 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -28,7 +28,6 @@
#include <pthread.h>
#include "srm_error.h"
-#include "srm_value.h"
static FILE *logfile;
static int debug_level;
[FILE: /srm/main/src/srm_error.h]
--- srm/main/src/srm_error.h:1.1 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_error.h Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.1 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.2 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -23,7 +23,16 @@
#ifndef __SRM_ERROR_H__
#define __SRM_ERROR_H__
-/* Exit codes (server part, for network part see main/srm_com.h) */
+
+/* Error codes (Network relates) */
+#define COM_ERROR_CREATE_SOCKET -2
+#define COM_ERROR_BIND -2
+#define COM_ERROR_LISTEN -2
+#define COM_ERROR_CREATE_SOCKET -2
+#define COM_ERROR_GET_HOSTNAME -2
+#define COM_ERROR_CANNOT_CONNECT -2
+
+/* Exit codes (server part) */
#define ERROR_CREATE_PTHREAD -1
#define ERROR_END_PTHREAD -2
[FILE: /srm/main/src/srm_protocol_standard.h]
--- srm/main/src/srm_protocol_standard.h:1.26 Wed Feb 19 19:15:54 2003 GMT
+++ srm/main/src/srm_protocol_standard.h Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.26 2003/02/19 20:15:54 derick Exp $ */
+/* $Id: cvstemp,v 1.27 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -23,8 +23,46 @@
#ifndef __CONNECTION_H__
#define __CONNECTION_H__
-#include "srm_com.h"
#include <sys/types.h>
+
+/* Packet types */
+#define PKT_HANDSHAKE1 1
+#define PKT_HANDSHAKE2 2
+#define PKT_ABORT 3
+#define PKT_DISCONNECT 4
+
+#define PKT_COMMAND 11
+#define PKT_DATA 12
+
+#define PKT_STORE_DATA 21
+#define PKT_RETRIEVE_DATA 22
+#define PKT_DELETE_DATA 23
+
+/* Protocol Types */
+#define PROTOCOL_NATIVE 1
+#define PROTOCOL_XML 2
+
+/* Encryption Types */
+#define ENCRYPTION_NONE 1
+
+/* Checksum Actions */
+#define CHKSUM_CHECK TRUE
+#define CHKSUM_SET FALSE
+
+/* Packet header */
+typedef struct pkt_header {
+ srm_ui8 type;
+ srm_ui8 version_major;
+ srm_ui8 version_minor;
+ protocol_t protocol;
+ encryption_t encryption;
+ srm_ui16 checksum;
+ srm_ui32 data_length;
+ sess_key_t session_key;
+ srm_ui8 smxs[16];
+ srm_ui8 reserved2[64];
+} pkt_header;
+
int srm_process_data (int fd);
[FILE: /srm/main/src/srm_protocols.c]
--- srm/main/src/srm_protocols.c:1.6 Wed Feb 19 19:15:54 2003 GMT
+++ srm/main/src/srm_protocols.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.6 2003/02/19 20:15:54 derick Exp $ */
+/* $Id: cvstemp,v 1.7 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -30,7 +30,6 @@
#include <string.h>
#include <sys/stat.h>
-#include "srm_com.h"
#include "srm_protocols.h"
#define SRM_MAX_PROTOCOLS 32
[FILE: /srm/main/src/srm_queue.c]
--- srm/main/src/srm_queue.c:1.5 Sun Feb 16 12:02:19 2003 GMT
+++ srm/main/src/srm_queue.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.5 2003/02/16 13:02:19 derick Exp $ */
+/* $Id: cvstemp,v 1.6 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -16,12 +16,11 @@
* Group. Portions created by Vulcan Logic Group are Copyright (C)
* 2000, 2001, 2002, 2003 Vulcan Logic Group. All Rights Reserved.
*
- * Author(s): Sterling Hughes <sterling@php.net>
+ * Author(s):
+ * Sterling Hughes <sterling@php.net>
*/
-#include "srm_config.h"
-#include "srm_value.h"
#include "srm_llist.h"
#include "srm_queue.h"
[FILE: /srm/main/src/storage.c]
--- srm/main/src/storage.c:1.20 Sun Feb 16 12:02:19 2003 GMT
+++ srm/main/src/storage.c Wed Feb 19 19:40:27 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.20 2003/02/16 13:02:19 derick Exp $ */
+/* $Id: cvstemp,v 1.21 2003/02/19 20:40:27 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -22,7 +22,6 @@
#include <stdlib.h>
#include "srm_client.h"
-#include "srm_value.h"
struct srm_value* srm_data_store (store_t store, connect_data_t connect_data, char* key, srm_ui16 key_length, srm_value* data)
{
[FILE: /srm/modules/skeleton/skeleton.c]
--- srm/modules/skeleton/skeleton.c:1.5 Sat Jan 18 15:11:31 2003 GMT
+++ srm/modules/skeleton/skeleton.c Wed Feb 19 19:40:29 2003 GMT
@@ -6,7 +6,6 @@
#include "config.h"
#include "ini_parser.h"
-#include "srm_com.h"
#include "srm_compat.h"
#include "srm_modules.h"
#include "srm_extname.h"
Received on Wed Feb 19 21:40:32 2003
This archive was generated by hypermail 2.1.8 : Tue Jan 06 2009 - 05:00:03 CET