测试通过。
This commit is contained in:
@@ -274,25 +274,25 @@ void ssl_stat_init(struct ssl_mgr * mgr)
|
|||||||
spec[SSL_UP_NEW]="ussl_new";
|
spec[SSL_UP_NEW]="ussl_new";
|
||||||
spec[SSL_UP_ERR]="ussl_err";
|
spec[SSL_UP_ERR]="ussl_err";
|
||||||
spec[SSL_UP_ERR_NO_CIPHER]="ussl_e_ciph";
|
spec[SSL_UP_ERR_NO_CIPHER]="ussl_e_ciph";
|
||||||
spec[SSL_UP_ERR_UNSUPPORT_PROTO]="ussl_e_proto";
|
spec[SSL_UP_ERR_UNSUPPORT_PROTO]="ussl_e_prt";
|
||||||
|
|
||||||
spec[SSL_UP_CLOSING]="ussl_clsing";
|
spec[SSL_UP_CLOSING]="ussl_clsing";
|
||||||
spec[SSL_UP_CLOSED]="ussl_clsed";
|
spec[SSL_UP_CLOSED]="ussl_clsed";
|
||||||
spec[SSL_UP_DIRTY_CLOSED]="ussl_dirty_cls";
|
spec[SSL_UP_DIRTY_CLOSED]="ussl_dt_cls";
|
||||||
spec[SSL_UP_CACHE_SZ]="usess_cache";
|
spec[SSL_UP_CACHE_SZ]="usess_cache";
|
||||||
spec[SSL_UP_CACHE_QUERY]="usess_query";
|
spec[SSL_UP_CACHE_QUERY]="usess_query";
|
||||||
spec[SSL_UP_CACHE_HIT]="usess_hitcnt";
|
spec[SSL_UP_CACHE_HIT]="usess_hitn";
|
||||||
|
|
||||||
spec[SSL_DOWN_NEW]="dssl_new";
|
spec[SSL_DOWN_NEW]="dssl_new";
|
||||||
spec[SSL_DOWN_ERR]="dssl_err";
|
spec[SSL_DOWN_ERR]="dssl_err";
|
||||||
spec[SSL_DOWN_ERR_NO_CERT]="no_cert";
|
spec[SSL_DOWN_ERR_NO_CERT]="dssl_e_cert";
|
||||||
spec[SSL_DOWN_ERR_INAPPROPRIATE_FALLBACK]="dssl_e_fb";
|
spec[SSL_DOWN_ERR_INAPPROPRIATE_FALLBACK]="dssl_e_fb";
|
||||||
spec[SSL_DOWN_CLOSING]="dssl_clsing";
|
spec[SSL_DOWN_CLOSING]="dssl_clsing";
|
||||||
spec[SSL_DOWN_CLOSED]="dssl_clsed";
|
spec[SSL_DOWN_CLOSED]="dssl_clsed";
|
||||||
spec[SSL_DOWN_DIRTY_CLOSED]="dssl_dirty_cls";
|
spec[SSL_DOWN_DIRTY_CLOSED]="dssl_dt_cls";
|
||||||
spec[SSL_DOWN_CACHE_SZ]="dsess_cache";
|
spec[SSL_DOWN_CACHE_SZ]="dsess_cache";
|
||||||
spec[SSL_DOWN_CACHE_QUERY]="dcache_query";
|
spec[SSL_DOWN_CACHE_QUERY]="dcache_query";
|
||||||
spec[SSL_DOWN_CACHE_HIT]="dsess_hitcnt";
|
spec[SSL_DOWN_CACHE_HIT]="dsess_hitn";
|
||||||
|
|
||||||
if(!mgr->no_sessticket)
|
if(!mgr->no_sessticket)
|
||||||
{
|
{
|
||||||
@@ -885,7 +885,7 @@ void ssl_stream_log_error(struct bufferevent * bev, enum tfe_conn_dir dir, struc
|
|||||||
/* Can happen for socket errs, ssl errs;
|
/* Can happen for socket errs, ssl errs;
|
||||||
* may happen for unclean ssl socket shutdowns. */
|
* may happen for unclean ssl socket shutdowns. */
|
||||||
sslerr = bufferevent_get_openssl_error(bev);
|
sslerr = bufferevent_get_openssl_error(bev);
|
||||||
switch(sslerr)
|
switch(ERR_GET_REASON(sslerr))
|
||||||
{
|
{
|
||||||
case SSL_R_INAPPROPRIATE_FALLBACK:
|
case SSL_R_INAPPROPRIATE_FALLBACK:
|
||||||
if(dir==CONN_DIR_DOWNSTREAM) fs_id=SSL_DOWN_ERR_INAPPROPRIATE_FALLBACK;
|
if(dir==CONN_DIR_DOWNSTREAM) fs_id=SSL_DOWN_ERR_INAPPROPRIATE_FALLBACK;
|
||||||
@@ -903,7 +903,7 @@ void ssl_stream_log_error(struct bufferevent * bev, enum tfe_conn_dir dir, struc
|
|||||||
}
|
}
|
||||||
if(fs_id>=0)
|
if(fs_id>=0)
|
||||||
{
|
{
|
||||||
FS_operate(mgr->fs_handle, mgr->fs_id[fs_id], 0, FS_OP_ADD, 1);
|
mgr->stat_val[fs_id]++;
|
||||||
}
|
}
|
||||||
if (!errno && !sslerr)
|
if (!errno && !sslerr)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user