refactor evrpc.h header filer

svn:r1241

diff --git a/Doxyfile b/Doxyfile
index ad04c6480e171ba797ee4d3d7ee719545262ada1..62b83efa7870ce51c48742f46301f2d4df9dfe4e 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -63,6 +63,7 @@ INPUT                  = event.h evdns.h evhttp.h evrpc.h \
                       include/event2/bufferevent_struct.h \
                       include/event2/bufferevent_compat.h \
                       include/event2/util.h \
+                      include/event2/rpc.h include/event2/rpc_struct.h \
                       include/event2/dns.h include/event2/dns_struct.h \
                       include/event2/dns_compat.h \
                       include/event2/http.h include/event2/http_struct.h \

diff --git a/include/Makefile.am b/include/Makefile.am
index a069840f2e165d24aee394dbedf3ad45e2e108eb..4be3a730c0d525f6d7a385af17a1f0ff7e136184 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -15,4 +15,5 @@ nobase_include_HEADERS = \
         event2/bufferevent_struct.h event2/event.h event2/event_compat.h \
         event2/event_struct.h event2/tag.h event2/util.h \
        event2/http.h event2/http_struct.h event2/http_compat.h \
+       event2/rpc.h event2/rpc_struct.h \
        event2/dns.h event2/dns_struct.h event2/dns_compat.h

diff --git a/evrpc.h b/include/event2/rpc.h
similarity index 94%
rename from evrpc.h
rename to include/event2/rpc.h
index 85721ffc87daf70941f03ec14b0be706c08e2ac4..51c38ff432a5635866c43adc6fe8efa6b6f29e0f 100644 (file)
--- a/evrpc.h
+++ b/include/event2/rpc.h
@@ -24,15 +24,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _EVRPC_H_
-#define _EVRPC_H_
+#ifndef _EVENT2_RPC_H_
+#define _EVENT2_RPC_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <event2/event_struct.h>
-
 /** @file evrpc.h
  *
  * This header files provides basic support for an RPC server and client.
@@ -72,42 +70,7 @@ struct evbuffer;
 struct event_base;
 struct evrpc_req_generic;
 struct evrpc_request_wrapper;
-
-/* Encapsulates a request */
-struct evrpc {
-       TAILQ_ENTRY(evrpc) next;
-
-       /* the URI at which the request handler lives */
-       const char* uri;
-
-       /* creates a new request structure */
-       void *(*request_new)(void);
-
-       /* frees the request structure */
-       void (*request_free)(void *);
-
-       /* unmarshals the buffer into the proper request structure */
-       int (*request_unmarshal)(void *, struct evbuffer *);
-
-       /* creates a new reply structure */
-       void *(*reply_new)(void);
-
-       /* creates a new reply structure */
-       void (*reply_free)(void *);
-
-       /* verifies that the reply is valid */
-       int (*reply_complete)(void *);
-       
-       /* marshals the reply into a buffer */
-       void (*reply_marshal)(struct evbuffer*, void *);
-
-       /* the callback invoked for each received rpc */
-       void (*cb)(struct evrpc_req_generic *, void *);
-       void *cb_arg;
-
-       /* reference for further configuration */
-       struct evrpc_base *base;
-};
+struct evrpc;
 
 /** The type of a specific RPC Message
  *
@@ -539,4 +502,4 @@ void evrpc_request_set_cb(struct evrpc_request_wrapper *ctx,
 }
 #endif
 
-#endif /* _EVRPC_H_ */
+#endif /* _EVENT2_RPC_H_ */

diff --git a/include/event2/rpc_struct.h b/include/event2/rpc_struct.h
new file mode 100644 (file)
index 0000000..a400e7e
--- /dev/null
+++ b/include/event2/rpc_struct.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2009 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _EVENT2_RPC_STRUCT_H_
+#define _EVENT2_RPC_STRUCT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @file evrpc_struct.h
+ *
+ * This header files provides basic support for an RPC server and client.
+ */
+
+/* Encapsulates a request */
+struct evrpc {
+       TAILQ_ENTRY(evrpc) next;
+
+       /* the URI at which the request handler lives */
+       const char* uri;
+
+       /* creates a new request structure */
+       void *(*request_new)(void);
+
+       /* frees the request structure */
+       void (*request_free)(void *);
+
+       /* unmarshals the buffer into the proper request structure */
+       int (*request_unmarshal)(void *, struct evbuffer *);
+
+       /* creates a new reply structure */
+       void *(*reply_new)(void);
+
+       /* creates a new reply structure */
+       void (*reply_free)(void *);
+
+       /* verifies that the reply is valid */
+       int (*reply_complete)(void *);
+       
+       /* marshals the reply into a buffer */
+       void (*reply_marshal)(struct evbuffer*, void *);
+
+       /* the callback invoked for each received rpc */
+       void (*cb)(struct evrpc_req_generic *, void *);
+       void *cb_arg;
+
+       /* reference for further configuration */
+       struct evrpc_base *base;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EVENT2_RPC_STRUCT_H_ */