Skip to content

Commit c8b7aa8

Browse files
committed
+ Minor fix and guard on SSL
1 parent c0fac2c commit c8b7aa8

9 files changed

+7
-1
lines changed

docs/cn/baidu_std.md

100755100644
File mode changed.

docs/cn/client.md

100755100644
File mode changed.

docs/cn/server.md

100755100644
File mode changed.

docs/en/client.md

100755100644
File mode changed.

docs/en/http_service.md

100755100644
File mode changed.

docs/en/server.md

100755100644
File mode changed.

docs/en/tutorial_on_building_services.pptx

100755100644
File mode changed.

src/brpc/socket.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -1769,6 +1769,10 @@ ssize_t Socket::DoWrite(WriteRequest* req) {
17691769

17701770
int Socket::SSLHandshake(int fd, bool server_mode) {
17711771
if (_options.ssl_ctx == NULL) {
1772+
if (server_mode) {
1773+
LOG(ERROR) << "Lack SSL configuration to handle SSL request";
1774+
return -1;
1775+
}
17721776
return 0;
17731777
}
17741778

@@ -1866,7 +1870,7 @@ ssize_t Socket::DoRead(size_t size_hint) {
18661870
return _read_buf.append_from_file_descriptor(fd(), size_hint);
18671871
}
18681872

1869-
CHECK(ssl_state() == SSL_CONNECTED);
1873+
CHECK(ssl_state() == SSL_CONNECTED) << ssl_state();
18701874
int ssl_error = 0;
18711875
ssize_t nr = _read_buf.append_from_SSL_channel(_ssl_session, &ssl_error, size_hint);
18721876
switch (ssl_error) {

test/brpc_ssl_unittest.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -331,4 +331,6 @@ TEST_F(SSLTest, ssl_perf) {
331331
ASSERT_EQ(0, pthread_create(&spid, NULL, ssl_perf_server , serv_ssl));
332332
ASSERT_EQ(0, pthread_join(cpid, NULL));
333333
ASSERT_EQ(0, pthread_join(spid, NULL));
334+
close(clifd);
335+
close(servfd);
334336
}

0 commit comments

Comments
 (0)