breeze/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-02-08 01:33:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix kafka warnings on clang

Browse Source
This commit is contained in:
XieHan
2021-08-24 17:17:56 +08:00
parent 02c65e6934
commit b55e318a77
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/factory/KafkaTaskImpl.cc
View File

@@ -115,10 +115,11 @@ CommMessageOut *__ComplexKafkaTask::message_out()
if (seqid == 0)
{
KafkaConnectionInfo *conn_info = new KafkaConnectionInfo;
this->get_connection()->set_context(conn_info, std::move([](void *ctx) {
delete (KafkaConnectionInfo *)ctx;
}));
this->get_req()->set_api(&conn_info->api);
this->get_connection()->set_context(conn_info, [](void *ctx) {
delete (KafkaConnectionInfo *)ctx;
});
if (!this->get_req()->get_config()->get_broker_version())
{

3
src/protocol/KafkaMessage.cc
View File

@@ -3819,7 +3819,8 @@ int KafkaResponse::append(const void *buf, size_t *size)
if (strncasecmp(this->config.get_sasl_mech(), "SCRAM", 5) == 0)
{
this->clear_buf();
if (this->sasl->scram.state != -1)
if (this->sasl->scram.state !=
KAFKA_SASL_SCRAM_STATE_CLIENT_FINISHED)
ret = this->handle_sasl_continue();
else
this->sasl->status = 1;

2
src/protocol/kafka_parser.c
View File

@@ -1111,7 +1111,7 @@ static int kafka_sasl_scram_recv(const char *buf, size_t len, void *p, void *q)
case KAFKA_SASL_SCRAM_STATE_CLIENT_FINAL_MESSAGE:
ret = scram_handle_server_final_message(buf, len, conf, sasl);
sasl->scram.state = -1;
sasl->scram.state = KAFKA_SASL_SCRAM_STATE_CLIENT_FINISHED;
break;
default:

15
src/protocol/kafka_parser.h
View File

@@ -226,18 +226,21 @@ typedef struct __kafka_parser
size_t hsize;
} kafka_parser_t;
enum __kafka_scram_state
{
KAFKA_SASL_SCRAM_STATE_CLIENT_FIRST_MESSAGE,
KAFKA_SASL_SCRAM_STATE_SERVER_FIRST_MESSAGE,
KAFKA_SASL_SCRAM_STATE_CLIENT_FINAL_MESSAGE,
KAFKA_SASL_SCRAM_STATE_CLIENT_FINISHED,
};
typedef struct __kafka_scram
{
const void *evp;
unsigned char *(*scram_h)(const unsigned char *d, size_t n,
unsigned char *md);
size_t scram_h_size;
enum
{
KAFKA_SASL_SCRAM_STATE_CLIENT_FIRST_MESSAGE,
KAFKA_SASL_SCRAM_STATE_SERVER_FIRST_MESSAGE,
KAFKA_SASL_SCRAM_STATE_CLIENT_FINAL_MESSAGE,
} state;
enum __kafka_scram_state state;
struct iovec cnonce;
struct iovec first_msg;
struct iovec server_signature_b64;