===================================================================
RCS file: /home/cvs/OpenXM/src/ox_ntl/oxserv.h,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM/src/ox_ntl/oxserv.h	2003/11/03 03:11:21	1.1
+++ OpenXM/src/ox_ntl/oxserv.h	2008/09/19 10:55:40	1.7
@@ -1,29 +1,55 @@
-/* $OpenXM$ */
+/* $OpenXM: OpenXM/src/ox_ntl/oxserv.h,v 1.6 2004/07/11 00:32:17 iwane Exp $ */
 
 #ifndef __OX_SERVE_H__
 #define __OX_SERVE_H__
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <signal.h>
 #include "ox_toolkit.h"
 
+#ifndef OXSERV_FAILURE
 #define OXSERV_FAILURE	(-1)
 #define OXSERV_SUCCESS  ( 0)
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* signal */
+extern int      G_oxserv_sigusr1cnt;
+extern int      G_oxserv_sigusr1flag;
+
+#define	BLOCK_INPUT()	do { \
+	G_oxserv_sigusr1cnt++;			\
+} while(0)
+
+#define	UNBLOCK_INPUT()	do { \
+	G_oxserv_sigusr1cnt--; 		\
+	if (G_oxserv_sigusr1cnt == 0 && G_oxserv_sigusr1flag) {	\
+		oxserv_sm_control_reset_connection(0);		\
+	}					\
+} while(0)
+
 /* c.f. mathcap_init in ox_toolkit */
-int	 oxserv_init(OXFILE *, int, char *, char *, int *, int *);
-void	 oxserv_dest(void);
+int	 oxserv_init	(OXFILE *, int, char *, char *, int *, int *);
+void	 oxserv_dest	(void);
 
-int	 oxserv_receive(OXFILE *);
+int	 oxserv_receive	(OXFILE *);
 
-int	 oxserv_set(int mode, void *, void *);
+void	 oxserv_sm_control_reset_connection(int);
 
-#define OXSERV_SET_EXECUTE_STRING_PARSER	(0x01)
-#define OXSERV_SET_EXECUTE_FUNCTION		(0x02)
-#define OXSERV_SET_CONVERT_CMO                  (0x03)
+int	 oxserv_set	(int mode, void *, void *);
 
+#define OXSERV_SET_EXECUTE_STRING_PARSER        (0x01)
+#define OXSERV_SET_EXECUTE_FUNCTION             (0x02)
+#define OXSERV_SET_CONVERT_CMO                  (0x03)
+#define OXSERV_SET_DELETE_CMO                   (0x04)
+#define OXSERV_SET_GET_CMOTAG                   (0x05)
+#define OXSERV_SET_CONVERT_STR                  (0x06)
 
 #ifdef __cplusplus
 }