mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

REORG: include: move protocol_buffers.h to haproxy/protobuf{,-t}.h

Browse Source 
There is no C file for this one, the code was placed into sample.c which
thus has a dependency on this file which itself includes sample.h. Probably
that it would be wise to split that later.
This commit is contained in:
Willy Tarreau 2020-06-04 16:06:59 +02:00
parent e6ce10be85
commit b23e5958ed
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/arg-t.h
View File

@ -27,9 +27,9 @@
#include <haproxy/buf-t.h> #include <haproxy/buf-t.h>
#include <haproxy/list-t.h> #include <haproxy/list-t.h>
#include <haproxy/protobuf-t.h>
#include <types/vars.h> #include <types/vars.h>
#include <types/protocol_buffers.h>
#include <types/stick_table.h> #include <types/stick_table.h>
/* encoding of each arg type : up to 31 types are supported */ /* encoding of each arg type : up to 31 types are supported */

10
include/types/protocol_buffers.h → include/haproxy/protobuf-t.h
View File

@ -1,5 +1,5 @@
/* /*
* include/types/protocol_buffers.h * include/haproxy/protobuf-t.h
* This file contains structure declarations for protocol buffers. * This file contains structure declarations for protocol buffers.
* *
* Copyright 2012 Willy Tarreau <w@1wt.eu> * Copyright 2012 Willy Tarreau <w@1wt.eu>
@ -19,8 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _TYPES_PROTOCOL_BUFFERS_H #ifndef _HAPROXY_PROTOBUF_T_H
#define _TYPES_PROTOCOL_BUFFERS_H #define _HAPROXY_PROTOBUF_T_H
#include <haproxy/api-t.h>
enum protobuf_wire_type { enum protobuf_wire_type {
PBUF_TYPE_VARINT, PBUF_TYPE_VARINT,
@ -75,7 +77,7 @@ struct protobuf_parser_def {
unsigned char *pos, size_t left, size_t vlen); unsigned char *pos, size_t left, size_t vlen);
}; };
#endif /* _TYPES_PROTOCOL_BUFFERS_H */ #endif /* _HAPROXY_PROTOBUF_T_H */
/* /*
* Local variables: * Local variables:

12
include/proto/protocol_buffers.h → include/haproxy/protobuf.h
View File

@ -1,5 +1,5 @@
/* /*
* include/proto/protocol_buffers.h * include/haproxy/protobuf.h
* This file contains functions and macros declarations for protocol buffers decoding. * This file contains functions and macros declarations for protocol buffers decoding.
* *
* Copyright 2012 Willy Tarreau <w@1wt.eu> * Copyright 2012 Willy Tarreau <w@1wt.eu>
@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _PROTO_PROTOCOL_BUFFERS_H #ifndef _HAPROXY_PROTOBUF_H
#define _PROTO_PROTOCOL_BUFFERS_H #define _HAPROXY_PROTOBUF_H
#include <inttypes.h> #include <haproxy/api-t.h>
#include <haproxy/arg-t.h> #include <haproxy/arg-t.h>
#include <haproxy/protobuf-t.h>
#include <haproxy/sample-t.h> #include <haproxy/sample-t.h>
#include <types/protocol_buffers.h>
#define PBUF_VARINT_DONT_STOP_BIT 7 #define PBUF_VARINT_DONT_STOP_BIT 7
#define PBUF_VARINT_DONT_STOP_BITMASK (1 << PBUF_VARINT_DONT_STOP_BIT) #define PBUF_VARINT_DONT_STOP_BITMASK (1 << PBUF_VARINT_DONT_STOP_BIT)
@ -567,7 +567,7 @@ static inline int protobuf_field_lookup(const struct arg *arg_p, struct sample *
return 0; return 0;
} }
#endif /* _PROTO_PROTOCOL_BUFFERS_H */ #endif /* _HAPROXY_PROTOBUF_H */
/* /*
* Local variables: * Local variables:

2
src/sample.c
View File

@ -25,6 +25,7 @@
#include <haproxy/hash.h> #include <haproxy/hash.h>
#include <haproxy/http.h> #include <haproxy/http.h>
#include <haproxy/net_helper.h> #include <haproxy/net_helper.h>
#include <haproxy/protobuf.h>
#include <haproxy/regex.h> #include <haproxy/regex.h>
#include <haproxy/sample.h> #include <haproxy/sample.h>
#include <haproxy/tools.h> #include <haproxy/tools.h>
@ -34,7 +35,6 @@
#include <haproxy/arg.h> #include <haproxy/arg.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/proxy.h> #include <proto/proxy.h>
#include <proto/protocol_buffers.h>
#include <haproxy/sink.h> #include <haproxy/sink.h>
#include <proto/stick_table.h> #include <proto/stick_table.h>
#include <proto/vars.h> #include <proto/vars.h>