Skip to content

Commit 654d1a7

Browse files
faizshukrifaizshukri
committed
MNDR:
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec). PPEC does only the encoding and decoding to the protocol frame.
1 parent 80d59a3 commit 654d1a7

13 files changed

+247
-235
lines changed

‎ext/mysqlnd/mysqlnd.c

+3-5
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, dtor)(MYSQLND_CONN_DATA * conn)
342342
conn->m->free_options(conn);
343343

344344
if (conn->net) {
345-
mysqlnd_net_free(conn->net, conn->stats, conn->error_info);
345+
mysqlnd_ppec_free(conn->net, conn->stats, conn->error_info);
346346
conn->net = NULL;
347347
}
348348

@@ -664,7 +664,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, execute_init_commands)(MYSQLND_CONN_DATA * con
664664
static unsigned int
665665
MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, unsigned int mysql_flags)
666666
{
667-
MYSQLND_NET * net = conn->net;
667+
MYSQLND_PPEC * net = conn->net;
668668
MYSQLND_VIO * vio = conn->vio;
669669

670670
DBG_ENTER("mysqlnd_conn_data::get_updated_connect_flags");
@@ -784,10 +784,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
784784
zend_bool reconnect = FALSE;
785785
zend_bool saved_compression = FALSE;
786786
zend_bool local_tx_started = FALSE;
787-
MYSQLND_NET * net = conn->net;
787+
MYSQLND_PPEC * net = conn->net;
788788
MYSQLND_STRING transport = { NULL, 0 };
789-
// char * transport = NULL;
790-
// int transport_len;
791789

792790
DBG_ENTER("mysqlnd_conn_data::connect");
793791
DBG_INF_FMT("conn=%p", conn);

‎ext/mysqlnd/mysqlnd_auth.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ mysqlnd_native_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
360360
MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd,
361361
const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len,
362362
const MYSQLND_SESSION_OPTIONS * const session_options,
363-
const MYSQLND_NET_OPTIONS * const io_options,
363+
const MYSQLND_PPEC_OPTIONS * const ppec_options,
364364
zend_ulong mysql_flags
365365
)
366366
{
@@ -420,7 +420,7 @@ mysqlnd_pam_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self,
420420
MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd,
421421
const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len,
422422
const MYSQLND_SESSION_OPTIONS * const session_options,
423-
const MYSQLND_NET_OPTIONS * const io_options,
423+
const MYSQLND_PPEC_OPTIONS * const ppec_options,
424424
zend_ulong mysql_flags
425425
)
426426
{
@@ -481,7 +481,7 @@ mysqlnd_xor_string(char * dst, const size_t dst_len, const char * xor_str, const
481481
static RSA *
482482
mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,
483483
const MYSQLND_SESSION_OPTIONS * const session_options,
484-
const MYSQLND_NET_OPTIONS * const io_options
484+
const MYSQLND_PPEC_OPTIONS * const io_options
485485
)
486486
{
487487
RSA * ret = NULL;
@@ -570,7 +570,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
570570
MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd,
571571
const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len,
572572
const MYSQLND_SESSION_OPTIONS * const session_options,
573-
const MYSQLND_NET_OPTIONS * const io_options,
573+
const MYSQLND_PPEC_OPTIONS * const ppec_options,
574574
zend_ulong mysql_flags
575575
)
576576
{
@@ -588,7 +588,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
588588
memcpy(ret, passwd, passwd_len);
589589
} else {
590590
*auth_data_len = 0;
591-
server_public_key = mysqlnd_sha256_get_rsa_key(conn, session_options, io_options);
591+
server_public_key = mysqlnd_sha256_get_rsa_key(conn, session_options, ppec_options);
592592

593593
if (server_public_key) {
594594
int server_public_key_len;

‎ext/mysqlnd/mysqlnd_driver.c

+25-25
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(struct st_mysqlnd_object_
140140

141141
mysqlnd_stats_init(&data->stats, STAT_LAST, persistent);
142142

143-
data->net = mysqlnd_net_init(persistent, data->stats, data->error_info);
143+
data->net = mysqlnd_ppec_init(persistent, data->stats, data->error_info);
144144
data->vio = mysqlnd_vio_init(persistent, data->stats, data->error_info);
145145
data->payload_decoder_factory = mysqlnd_protocol_payload_decoder_factory_init(data, persistent);
146146
data->command_factory = mysqlnd_command_factory_get();
@@ -243,37 +243,37 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement)(MYSQLND_CONN_DATA
243243
/* }}} */
244244

245245

246-
/* {{{ mysqlnd_object_factory::get_net */
247-
static MYSQLND_NET *
248-
MYSQLND_METHOD(mysqlnd_object_factory, get_net)(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
246+
/* {{{ mysqlnd_object_factory::get_ppec */
247+
static MYSQLND_PPEC *
248+
MYSQLND_METHOD(mysqlnd_object_factory, get_ppec)(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
249249
{
250-
size_t net_alloc_size = sizeof(MYSQLND_NET) + mysqlnd_plugin_count() * sizeof(void *);
251-
size_t net_data_alloc_size = sizeof(MYSQLND_NET_DATA) + mysqlnd_plugin_count() * sizeof(void *);
252-
MYSQLND_NET * net = mnd_pecalloc(1, net_alloc_size, persistent);
253-
MYSQLND_NET_DATA * net_data = mnd_pecalloc(1, net_data_alloc_size, persistent);
250+
size_t ppec_alloc_size = sizeof(MYSQLND_PPEC) + mysqlnd_plugin_count() * sizeof(void *);
251+
size_t ppec_data_alloc_size = sizeof(MYSQLND_PPEC_DATA) + mysqlnd_plugin_count() * sizeof(void *);
252+
MYSQLND_PPEC * ppec = mnd_pecalloc(1, ppec_alloc_size, persistent);
253+
MYSQLND_PPEC_DATA * ppec_data = mnd_pecalloc(1, ppec_data_alloc_size, persistent);
254254

255-
DBG_ENTER("mysqlnd_object_factory::get_net");
255+
DBG_ENTER("mysqlnd_object_factory::get_ppec");
256256
DBG_INF_FMT("persistent=%u", persistent);
257-
if (net && net_data) {
258-
net->data = net_data;
259-
net->persistent = net->data->persistent = persistent;
260-
net->data->m = *mysqlnd_net_get_methods();
261-
262-
if (PASS != net->data->m.init(net, stats, error_info)) {
263-
net->data->m.dtor(net, stats, error_info);
264-
net = NULL;
257+
if (ppec && ppec_data) {
258+
ppec->data = ppec_data;
259+
ppec->persistent = ppec->data->persistent = persistent;
260+
ppec->data->m = *mysqlnd_ppec_get_methods();
261+
262+
if (PASS != ppec->data->m.init(ppec, stats, error_info)) {
263+
ppec->data->m.dtor(ppec, stats, error_info);
264+
ppec = NULL;
265265
}
266266
} else {
267-
if (net_data) {
268-
mnd_pefree(net_data, persistent);
269-
net_data = NULL;
267+
if (ppec_data) {
268+
mnd_pefree(ppec_data, persistent);
269+
ppec_data = NULL;
270270
}
271-
if (net) {
272-
mnd_pefree(net, persistent);
273-
net = NULL;
271+
if (ppec) {
272+
mnd_pefree(ppec, persistent);
273+
ppec = NULL;
274274
}
275275
}
276-
DBG_RETURN(net);
276+
DBG_RETURN(ppec);
277277
}
278278
/* }}} */
279279

@@ -337,7 +337,7 @@ PHPAPI MYSQLND_CLASS_METHODS_START(mysqlnd_object_factory)
337337
MYSQLND_METHOD(mysqlnd_object_factory, get_connection),
338338
MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object),
339339
MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement),
340-
MYSQLND_METHOD(mysqlnd_object_factory, get_net),
340+
MYSQLND_METHOD(mysqlnd_object_factory, get_ppec),
341341
MYSQLND_METHOD(mysqlnd_object_factory, get_vio),
342342
MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)
343343
MYSQLND_CLASS_METHODS_END;

‎ext/mysqlnd/mysqlnd_ext_plugin.c

+30-15
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,30 @@ mysqlnd_plugin__get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int plu
140140
/* }}} */
141141

142142

143-
/* {{{ mysqlnd_plugin__get_plugin_net_data */
143+
/* {{{ mysqlnd_plugin__get_plugin_ppec_data */
144144
static void **
145-
mysqlnd_plugin__get_plugin_net_data(const MYSQLND_NET * net, unsigned int plugin_id)
145+
mysqlnd_plugin__get_plugin_ppec_data(const MYSQLND_PPEC * ppec, unsigned int plugin_id)
146146
{
147-
DBG_ENTER("_mysqlnd_plugin__get_plugin_net_data");
147+
DBG_ENTER("mysqlnd_plugin__get_plugin_ppec_data");
148148
DBG_INF_FMT("plugin_id=%u", plugin_id);
149-
if (!net || plugin_id >= mysqlnd_plugin_count()) {
149+
if (!ppec || plugin_id >= mysqlnd_plugin_count()) {
150150
return NULL;
151151
}
152-
DBG_RETURN((void *)((char *)net + sizeof(MYSQLND_NET) + plugin_id * sizeof(void *)));
152+
DBG_RETURN((void *)((char *)ppec + sizeof(MYSQLND_PPEC) + plugin_id * sizeof(void *)));
153+
}
154+
/* }}} */
155+
156+
157+
/* {{{ _mysqlnd_plugin__get_plugin_vio_data */
158+
static void **
159+
mysqlnd_plugin__get_plugin_vio_data(const MYSQLND_VIO * vio, unsigned int plugin_id)
160+
{
161+
DBG_ENTER("_mysqlnd_plugin__get_plugin_vio_data");
162+
DBG_INF_FMT("plugin_id=%u", plugin_id);
163+
if (!vio || plugin_id >= mysqlnd_plugin_count()) {
164+
return NULL;
165+
}
166+
DBG_RETURN((void *)((char *)vio + sizeof(MYSQLND_VIO) + plugin_id * sizeof(void *)));
153167
}
154168
/* }}} */
155169

@@ -163,7 +177,8 @@ struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters =
163177
mysqlnd_plugin__get_plugin_result_buffered_data_c,
164178
mysqlnd_plugin__get_plugin_stmt_data,
165179
mysqlnd_plugin__get_plugin_protocol_data,
166-
mysqlnd_plugin__get_plugin_net_data,
180+
mysqlnd_plugin__get_plugin_ppec_data,
181+
mysqlnd_plugin__get_plugin_vio_data,
167182
};
168183

169184

@@ -309,20 +324,20 @@ _mysqlnd_protocol_payload_decoder_factory_set_methods(MYSQLND_CLASS_METHODS_TYPE
309324
/* }}} */
310325

311326

312-
/* {{{ _mysqlnd_net_get_methods */
313-
static MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) *
314-
_mysqlnd_net_get_methods()
327+
/* {{{ _mysqlnd_ppec_get_methods */
328+
static MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) *
329+
_mysqlnd_ppec_get_methods()
315330
{
316-
return &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_net);
331+
return &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_packet_envelope_codec);
317332
}
318333
/* }}} */
319334

320335

321-
/* {{{ _mysqlnd_net_set_methods */
336+
/* {{{ _mysqlnd_ppec_set_methods */
322337
static void
323-
_mysqlnd_net_set_methods(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) * methods)
338+
_mysqlnd_ppec_set_methods(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * methods)
324339
{
325-
MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_net) = *methods;
340+
MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_packet_envelope_codec) = *methods;
326341
}
327342
/* }}} */
328343

@@ -416,8 +431,8 @@ struct st_mysqlnd_plugin_methods_xetters mysqlnd_plugin_methods_xetters =
416431
_mysqlnd_protocol_payload_decoder_factory_set_methods,
417432
},
418433
{
419-
_mysqlnd_net_get_methods,
420-
_mysqlnd_net_set_methods,
434+
_mysqlnd_ppec_get_methods,
435+
_mysqlnd_ppec_set_methods,
421436
},
422437
{
423438
_mysqlnd_vio_get_methods,

‎ext/mysqlnd/mysqlnd_ext_plugin.h

+10-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ struct st_mysqlnd_plugin__plugin_area_getters
3131
void ** (*get_result_buffered_aread_c)(const MYSQLND_RES_BUFFERED_C * result, unsigned int plugin_id);
3232
void ** (*get_stmt_area)(const MYSQLND_STMT * stmt, unsigned int plugin_id);
3333
void ** (*get_protocol_decoder_area)(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id);
34-
void ** (*get_net_area)(const MYSQLND_NET * net, unsigned int plugin_id);
34+
void ** (*get_ppec_area)(const MYSQLND_PPEC * ppec, unsigned int plugin_id);
35+
void ** (*get_vio_area)(const MYSQLND_VIO * vio, unsigned int plugin_id);
3536
};
3637

3738
extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters;
@@ -44,7 +45,8 @@ extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters
4445
#define mysqlnd_plugin_get_plugin_result_buffered_data_c(res, p_id) mysqlnd_plugin_area_getters.get_result_buffered_aread_c((res), (p_id))
4546
#define mysqlnd_plugin_get_plugin_stmt_data(stmt, p_id) mysqlnd_plugin_area_getters.get_stmt_area((stmt), (p_id))
4647
#define mysqlnd_plugin_get_plugin_protocol_data(proto, p_id) mysqlnd_plugin_area_getters.get_protocol_decoder_area((proto), (p_id))
47-
#define mysqlnd_plugin_get_plugin_net_data(net, p_id) mysqlnd_plugin_area_getters.get_net_area((net), (p_id))
48+
#define mysqlnd_plugin_get_plugin_ppec_data(ppec, p_id) mysqlnd_plugin_area_getters.get_ppec_area((ppec), (p_id))
49+
#define mysqlnd_plugin_get_plugin_vio_data(vio, p_id) mysqlnd_plugin_area_getters.get_ppec_area((vio), (p_id))
4850

4951

5052
struct st_mysqlnd_plugin_methods_xetters
@@ -97,11 +99,11 @@ struct st_mysqlnd_plugin_methods_xetters
9799
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) *methods);
98100
} protocol;
99101

100-
struct st_mnd_net_xetters
102+
struct st_mnd_ppec_xetters
101103
{
102-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) * (*get)();
103-
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) * methods);
104-
} net;
104+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * (*get)();
105+
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * methods);
106+
} ppec;
105107

106108
struct st_mnd_vio_xetters
107109
{
@@ -149,8 +151,8 @@ extern struct st_mysqlnd_plugin_methods_xetters mysqlnd_plugin_methods_xetters;
149151
#define mysqlnd_protocol_get_methods() mysqlnd_plugin_methods_xetters.protocol.get()
150152
#define mysqlnd_protocol_set_methods(m) mysqlnd_plugin_methods_xetters.protocol.set((m))
151153

152-
#define mysqlnd_net_get_methods() mysqlnd_plugin_methods_xetters.net.get()
153-
#define mysqlnd_net_set_methods(m) mysqlnd_plugin_methods_xetters.net.set((m))
154+
#define mysqlnd_ppec_get_methods() mysqlnd_plugin_methods_xetters.ppec.get()
155+
#define mysqlnd_ppec_set_methods(m) mysqlnd_plugin_methods_xetters.ppec.set((m))
154156

155157
#define mysqlnd_vio_get_methods() mysqlnd_plugin_methods_xetters.vio.get()
156158
#define mysqlnd_vio_set_methods(m) mysqlnd_plugin_methods_xetters.vio.set((m))

‎ext/mysqlnd/mysqlnd_loaddata.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * const filenam
151151
int bufsize;
152152
size_t ret;
153153
MYSQLND_INFILE infile;
154-
MYSQLND_NET * net = conn->net;
154+
MYSQLND_PPEC * net = conn->net;
155155
MYSQLND_VIO * vio = conn->vio;
156156

157157
DBG_ENTER("mysqlnd_handle_local_infile");

‎ext/mysqlnd/mysqlnd_priv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_res);
154154
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_result_unbuffered);
155155
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_result_buffered);
156156
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol_payload_decoder_factory);
157-
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_net);
157+
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol_packet_envelope_codec);
158158
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_vio);
159159
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_upsert_status);
160160
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_error_info);

‎ext/mysqlnd/mysqlnd_ps.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -2185,15 +2185,15 @@ MYSQLND_METHOD(mysqlnd_stmt, free_stmt_content)(MYSQLND_STMT * const s)
21852185
/* }}} */
21862186

21872187

2188-
/* {{{ mysqlnd_stmt::net_close */
2188+
/* {{{ mysqlnd_stmt::close_on_server */
21892189
static enum_func_status
2190-
MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const s, zend_bool implicit)
2190+
MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server)(MYSQLND_STMT * const s, zend_bool implicit)
21912191
{
21922192
MYSQLND_STMT_DATA * stmt = s? s->data:NULL;
21932193
MYSQLND_CONN_DATA * conn;
21942194
enum_mysqlnd_collected_stats statistic = STAT_LAST;
21952195

2196-
DBG_ENTER("mysqlnd_stmt::net_close");
2196+
DBG_ENTER("mysqlnd_stmt::close_on_server");
21972197
if (!stmt || !stmt->conn) {
21982198
DBG_RETURN(FAIL);
21992199
}
@@ -2292,7 +2292,7 @@ MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit)
22922292
MYSQLND_INC_GLOBAL_STATISTIC(implicit == TRUE? STAT_STMT_CLOSE_IMPLICIT:
22932293
STAT_STMT_CLOSE_EXPLICIT);
22942294

2295-
ret = s->m->net_close(s, implicit);
2295+
ret = s->m->close_on_server(s, implicit);
22962296
mnd_pefree(stmt, persistent);
22972297
}
22982298
mnd_pefree(s, persistent);
@@ -2368,7 +2368,7 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_stmt)
23682368
MYSQLND_METHOD(mysqlnd_stmt, free_result),
23692369
MYSQLND_METHOD(mysqlnd_stmt, data_seek),
23702370
MYSQLND_METHOD(mysqlnd_stmt, reset),
2371-
MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close),
2371+
MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server),
23722372
MYSQLND_METHOD(mysqlnd_stmt, dtor),
23732373

23742374
MYSQLND_METHOD(mysqlnd_stmt, fetch),

0 commit comments

Comments
 (0)