REORG: move applet.h to haproxy/applet{,-t}.h
The type file was slightly tidied. The cli-specific APPCTX_CLI_ST1_* flag
definitions were moved to cli.h. The type file was adjusted to include
buf-t.h and not the huge buf.h. A few call places were fixed because they
did not need this include.
diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h
index 9a76366..59012fc 100644
--- a/include/haproxy/action-t.h
+++ b/include/haproxy/action-t.h
@@ -24,7 +24,7 @@
#include <haproxy/regex-t.h>
-#include <types/applet.h>
+#include <haproxy/applet-t.h>
#include <haproxy/stick_table-t.h>
enum act_from {
diff --git a/include/types/applet.h b/include/haproxy/applet-t.h
similarity index 95%
rename from include/types/applet.h
rename to include/haproxy/applet-t.h
index c32dd8e..4323905 100644
--- a/include/types/applet.h
+++ b/include/haproxy/applet-t.h
@@ -1,8 +1,8 @@
/*
- * include/types/applet.h
+ * include/haproxy/applet-t.h
* This file describes the applet struct and associated constants.
*
- * Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,19 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_APPLET_H
-#define _TYPES_APPLET_H
+#ifndef _HAPROXY_APPLET_T_H
+#define _HAPROXY_APPLET_T_H
-#include <haproxy/api-t.h>
-#include <haproxy/buf.h>
+#include <haproxy/buf-t.h>
#include <haproxy/dynbuf-t.h>
#include <haproxy/freq_ctr-t.h>
#include <haproxy/hlua-t.h>
#include <haproxy/obj_type-t.h>
+#include <haproxy/api-t.h>
#include <haproxy/xref-t.h>
+
#include <types/proxy.h>
#include <types/stream.h>
+/* flags for appctx->state */
+#define APPLET_WANT_DIE 0x01 /* applet was running and requested to die */
+
struct appctx;
/* Applet descriptor */
@@ -46,12 +50,6 @@
unsigned int timeout; /* execution timeout. */
};
-#define APPLET_WANT_DIE 0x01 /* applet was running and requested to die */
-
-#define APPCTX_CLI_ST1_PROMPT (1 << 0)
-#define APPCTX_CLI_ST1_PAYLOAD (1 << 1)
-#define APPCTX_CLI_ST1_NOLF (1 << 2)
-
/* Context of a running applet. */
struct appctx {
enum obj_type obj_type; /* OBJ_TYPE_APPCTX */
@@ -188,7 +186,7 @@
} ctx; /* context-specific variables used by any applet */
};
-#endif /* _TYPES_APPLET_H */
+#endif /* _HAPROXY_APPLET_T_H */
/*
* Local variables:
diff --git a/include/proto/applet.h b/include/haproxy/applet.h
similarity index 95%
rename from include/proto/applet.h
rename to include/haproxy/applet.h
index 48437f5..00ef4f6 100644
--- a/include/proto/applet.h
+++ b/include/haproxy/applet.h
@@ -1,5 +1,5 @@
/*
- * include/proto/applet.h
+ * include/haproxy/applet.h
* This file contains applet function prototypes
*
* Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
@@ -19,22 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_APPLET_H
-#define _PROTO_APPLET_H
+#ifndef _HAPROXY_APPLET_H
+#define _HAPROXY_APPLET_H
#include <stdlib.h>
+#include <haproxy/applet-t.h>
#include <haproxy/api.h>
-#include <haproxy/pool.h>
#include <haproxy/list.h>
-#include <types/applet.h>
+#include <haproxy/pool.h>
#include <haproxy/task.h>
extern unsigned int nb_applets;
extern struct pool_head *pool_head_appctx;
struct task *task_run_applet(struct task *t, void *context, unsigned short state);
-
int appctx_buf_available(void *arg);
@@ -117,7 +116,7 @@
task_wakeup(appctx->t, TASK_WOKEN_OTHER);
}
-#endif /* _PROTO_APPLET_H */
+#endif /* _HAPROXY_APPLET_H */
/*
* Local variables:
diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index 6f741e4..d77717a 100644
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -22,13 +22,13 @@
#ifndef _HAPROXY_OBJ_TYPE_H
#define _HAPROXY_OBJ_TYPE_H
+#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/check-t.h>
#include <haproxy/connection-t.h>
#include <haproxy/listener-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/pool.h>
-#include <types/applet.h>
#include <types/proxy.h>
#include <types/server.h>
#include <types/stream.h>
diff --git a/include/proto/cli.h b/include/proto/cli.h
index 13490af..cbd3cd9 100644
--- a/include/proto/cli.h
+++ b/include/proto/cli.h
@@ -23,8 +23,8 @@
#ifndef _PROTO_CLI_H
#define _PROTO_CLI_H
+#include <haproxy/applet-t.h>
#include <haproxy/global.h>
-#include <types/applet.h>
#include <types/channel.h>
#include <types/cli.h>
#include <types/stream.h>
diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index 6a9aa55..f5f0bf3 100644
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -22,11 +22,11 @@
#ifndef _PROTO_PROXY_H
#define _PROTO_PROXY_H
+#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/listener-t.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
-#include <types/applet.h>
#include <haproxy/global-t.h>
#include <types/proxy.h>
#include <haproxy/freq_ctr.h>
diff --git a/include/proto/server.h b/include/proto/server.h
index b84be43..4d78c1d 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -24,10 +24,10 @@
#include <unistd.h>
+#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/dns-t.h>
#include <haproxy/time.h>
-#include <types/applet.h>
#include <types/proxy.h>
#include <types/queue.h>
#include <types/server.h>
diff --git a/include/proto/stats.h b/include/proto/stats.h
index f98a5ec..84c64d0 100644
--- a/include/proto/stats.h
+++ b/include/proto/stats.h
@@ -23,9 +23,9 @@
#ifndef _PROTO_STATS_H
#define _PROTO_STATS_H
+#include <haproxy/applet-t.h>
#include <haproxy/tools.h>
#include <haproxy/api.h>
-#include <types/applet.h>
#include <types/stream_interface.h>
#include <types/stats.h>
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index e381d84..f17e6ae 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -24,11 +24,11 @@
#include <stdlib.h>
+#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/connection.h>
#include <types/stream.h>
#include <types/stream_interface.h>
-#include <proto/applet.h>
#include <proto/channel.h>
diff --git a/include/types/cli.h b/include/types/cli.h
index 41753c5..710e014 100644
--- a/include/types/cli.h
+++ b/include/types/cli.h
@@ -20,8 +20,8 @@
#ifndef _TYPES_CLI_H
#define _TYPES_CLI_H
+#include <haproxy/applet-t.h>
#include <haproxy/list-t.h>
-#include <types/applet.h>
/* Access level for a stats socket */
#define ACCESS_LVL_NONE 0
@@ -36,6 +36,11 @@
#define ACCESS_EXPERT 0x20 /* access to dangerous commands reserved to experts */
+/* flags for appctx->st1 */
+#define APPCTX_CLI_ST1_PROMPT (1 << 0)
+#define APPCTX_CLI_ST1_PAYLOAD (1 << 1)
+#define APPCTX_CLI_ST1_NOLF (1 << 2)
+
struct cli_kw {
const char *str_kw[5]; /* keywords ended by NULL, limited to 5
separated keywords combination */