aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/httpcli/httpcli.c2
-rw-r--r--src/core/iomgr/endpoint.c (renamed from src/core/endpoint/endpoint.c)2
-rw-r--r--src/core/iomgr/endpoint.h (renamed from src/core/endpoint/endpoint.h)0
-rw-r--r--src/core/iomgr/endpoint_pair.h2
-rw-r--r--src/core/iomgr/socket_utils_posix.c2
-rw-r--r--src/core/iomgr/tcp_client.h2
-rw-r--r--src/core/iomgr/tcp_posix.h2
-rw-r--r--src/core/iomgr/tcp_server.h2
-rw-r--r--src/core/security/secure_endpoint.c (renamed from src/core/endpoint/secure_endpoint.c)8
-rw-r--r--src/core/security/secure_endpoint.h (renamed from src/core/endpoint/secure_endpoint.h)2
-rw-r--r--src/core/security/secure_transport_setup.c2
-rw-r--r--src/core/security/secure_transport_setup.h2
-rw-r--r--src/core/security/security_context.c3
-rw-r--r--src/core/security/security_context.h2
-rw-r--r--src/core/surface/channel_create.c2
-rw-r--r--src/core/transport/chttp2_transport.h2
16 files changed, 18 insertions, 19 deletions
diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c
index 84a97a4783..bbca57b7dd 100644
--- a/src/core/httpcli/httpcli.c
+++ b/src/core/httpcli/httpcli.c
@@ -35,7 +35,7 @@
#include <string.h>
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/iomgr/resolve_address.h"
#include "src/core/iomgr/tcp_client.h"
#include "src/core/httpcli/format_request.h"
diff --git a/src/core/endpoint/endpoint.c b/src/core/iomgr/endpoint.c
index 07353751b0..259c948720 100644
--- a/src/core/endpoint/endpoint.c
+++ b/src/core/iomgr/endpoint.c
@@ -31,7 +31,7 @@
*
*/
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
void grpc_endpoint_notify_on_read(grpc_endpoint *ep, grpc_endpoint_read_cb cb,
void *user_data, gpr_timespec deadline) {
diff --git a/src/core/endpoint/endpoint.h b/src/core/iomgr/endpoint.h
index 14d9a56d55..14d9a56d55 100644
--- a/src/core/endpoint/endpoint.h
+++ b/src/core/iomgr/endpoint.h
diff --git a/src/core/iomgr/endpoint_pair.h b/src/core/iomgr/endpoint_pair.h
index 4a97ebf0f6..55678b5ddb 100644
--- a/src/core/iomgr/endpoint_pair.h
+++ b/src/core/iomgr/endpoint_pair.h
@@ -34,7 +34,7 @@
#ifndef __GRPC_INTERNAL_IOMGR_ENDPOINT_PAIR_H_
#define __GRPC_INTERNAL_IOMGR_ENDPOINT_PAIR_H_
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
typedef struct {
grpc_endpoint *client;
diff --git a/src/core/iomgr/socket_utils_posix.c b/src/core/iomgr/socket_utils_posix.c
index 262d606af9..e8c8071037 100644
--- a/src/core/iomgr/socket_utils_posix.c
+++ b/src/core/iomgr/socket_utils_posix.c
@@ -36,7 +36,7 @@
#ifdef GPR_POSIX_SOCKETUTILS
#define _BSD_SOURCE
-#include "src/core/endpoint/socket_utils.h"
+#include "src/core/iomgr/socket_utils_posix.h"
#include <fcntl.h>
#include <sys/socket.h>
diff --git a/src/core/iomgr/tcp_client.h b/src/core/iomgr/tcp_client.h
index a4632d81cf..ef2c4faf47 100644
--- a/src/core/iomgr/tcp_client.h
+++ b/src/core/iomgr/tcp_client.h
@@ -34,7 +34,7 @@
#ifndef __GRPC_INTERNAL_IOMGR_TCP_CLIENT_H__
#define __GRPC_INTERNAL_IOMGR_TCP_CLIENT_H__
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/iomgr/sockaddr.h"
#include <grpc/support/time.h>
diff --git a/src/core/iomgr/tcp_posix.h b/src/core/iomgr/tcp_posix.h
index 8a3c52894c..830394d534 100644
--- a/src/core/iomgr/tcp_posix.h
+++ b/src/core/iomgr/tcp_posix.h
@@ -44,7 +44,7 @@
otherwise specified.
*/
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/iomgr/iomgr_libevent.h"
#define GRPC_TCP_DEFAULT_READ_SLICE_SIZE 8192
diff --git a/src/core/iomgr/tcp_server.h b/src/core/iomgr/tcp_server.h
index bd6b46f538..46fba13f90 100644
--- a/src/core/iomgr/tcp_server.h
+++ b/src/core/iomgr/tcp_server.h
@@ -37,7 +37,7 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
/* Forward decl of grpc_tcp_server */
typedef struct grpc_tcp_server grpc_tcp_server;
diff --git a/src/core/endpoint/secure_endpoint.c b/src/core/security/secure_endpoint.c
index 964dc826db..34be4256a9 100644
--- a/src/core/endpoint/secure_endpoint.c
+++ b/src/core/security/secure_endpoint.c
@@ -31,14 +31,14 @@
*
*/
-#include "src/core/endpoint/secure_endpoint.h"
-#include "src/core/tsi/transport_security_interface.h"
+#include "src/core/security/secure_endpoint.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
-#include <grpc/support/slice.h>
#include <grpc/support/slice_buffer.h>
+#include <grpc/support/slice.h>
#include <grpc/support/string.h>
#include <grpc/support/sync.h>
+#include "src/core/tsi/transport_security_interface.h"
#define STAGING_BUFFER_SIZE 8192
@@ -67,7 +67,7 @@ typedef struct {
static void secure_endpoint_ref(secure_endpoint *ep) { gpr_ref(&ep->ref); }
static void destroy(secure_endpoint *secure_ep) {
- secure_endpoint *ep = (secure_endpoint *)secure_ep;
+ secure_endpoint *ep = secure_ep;
grpc_endpoint_destroy(ep->wrapped_ep);
tsi_frame_protector_destroy(ep->protector);
gpr_slice_buffer_destroy(&ep->leftover_bytes);
diff --git a/src/core/endpoint/secure_endpoint.h b/src/core/security/secure_endpoint.h
index 971170afed..d0f0fa7d5b 100644
--- a/src/core/endpoint/secure_endpoint.h
+++ b/src/core/security/secure_endpoint.h
@@ -34,8 +34,8 @@
#ifndef __GRPC_INTERNAL_ENDPOINT_SECURE_ENDPOINT_H__
#define __GRPC_INTERNAL_ENDPOINT_SECURE_ENDPOINT_H__
+#include "src/core/iomgr/endpoint.h"
#include <grpc/support/slice.h>
-#include "src/core/endpoint/endpoint.h"
struct tsi_frame_protector;
diff --git a/src/core/security/secure_transport_setup.c b/src/core/security/secure_transport_setup.c
index bc2e469af6..eb11251912 100644
--- a/src/core/security/secure_transport_setup.c
+++ b/src/core/security/secure_transport_setup.c
@@ -35,7 +35,7 @@
#include <string.h>
-#include "src/core/endpoint/secure_endpoint.h"
+#include "src/core/security/secure_endpoint.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/slice_buffer.h>
diff --git a/src/core/security/secure_transport_setup.h b/src/core/security/secure_transport_setup.h
index 1a20fa9a80..50f2b08529 100644
--- a/src/core/security/secure_transport_setup.h
+++ b/src/core/security/secure_transport_setup.h
@@ -34,7 +34,7 @@
#ifndef __GRPC_INTERNAL_SECURITY_SECURE_TRANSPORT_SETUP_H__
#define __GRPC_INTERNAL_SECURITY_SECURE_TRANSPORT_SETUP_H__
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/security/security_context.h"
/* --- Secure transport setup --- */
diff --git a/src/core/security/security_context.c b/src/core/security/security_context.c
index cb97c35130..13b9a847ee 100644
--- a/src/core/security/security_context.c
+++ b/src/core/security/security_context.c
@@ -35,15 +35,14 @@
#include <string.h>
-#include "src/core/endpoint/secure_endpoint.h"
#include "src/core/security/credentials.h"
+#include "src/core/security/secure_endpoint.h"
#include "src/core/surface/lame_client.h"
#include "src/core/transport/chttp2/alpn.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/slice_buffer.h>
#include <grpc/support/string.h>
-
#include "src/core/tsi/fake_transport_security.h"
#include "src/core/tsi/ssl_transport_security.h"
diff --git a/src/core/security/security_context.h b/src/core/security/security_context.h
index 0c6025643a..bbd7ff3b1a 100644
--- a/src/core/security/security_context.h
+++ b/src/core/security/security_context.h
@@ -35,7 +35,7 @@
#define __GRPC_INTERNAL_SECURITY_SECURITY_CONTEXT_H__
#include <grpc/grpc_security.h>
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/security/credentials.h"
#include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c
index 7d30b64204..41093d78ef 100644
--- a/src/core/surface/channel_create.c
+++ b/src/core/surface/channel_create.c
@@ -43,7 +43,7 @@
#include "src/core/channel/connected_channel.h"
#include "src/core/channel/http_client_filter.h"
#include "src/core/channel/http_filter.h"
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/iomgr/resolve_address.h"
#include "src/core/iomgr/tcp_client.h"
#include "src/core/surface/channel.h"
diff --git a/src/core/transport/chttp2_transport.h b/src/core/transport/chttp2_transport.h
index 24f26068bc..dd4419b98d 100644
--- a/src/core/transport/chttp2_transport.h
+++ b/src/core/transport/chttp2_transport.h
@@ -34,7 +34,7 @@
#ifndef __GRPC_INTERNAL_TRANSPORT_CHTTP2_TRANSPORT_H__
#define __GRPC_INTERNAL_TRANSPORT_CHTTP2_TRANSPORT_H__
-#include "src/core/endpoint/endpoint.h"
+#include "src/core/iomgr/endpoint.h"
#include "src/core/transport/transport.h"
void grpc_create_chttp2_transport(grpc_transport_setup_callback setup,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 23:28:43 +0000