MINOR: checks/sample: Remove unnecessary tests on the sample session
A sample must always have a session defined. Otherwise, it is a bug. So it is
unnecessary to test if it is defined when called from a health checks context.
This patch fixes the issue #616.
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index dfaea05..8b02a1d 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -8470,7 +8470,7 @@
{
struct connection *conn;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8509,7 +8509,7 @@
struct connection *conn;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8534,7 +8534,7 @@
struct connection *conn;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8568,7 +8568,7 @@
struct ssl_sock_ctx *ctx;
int sint;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8598,7 +8598,7 @@
struct connection *conn;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8629,7 +8629,7 @@
smp->flags = SMP_F_CONST;
smp->data.type = SMP_T_STR;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8663,7 +8663,7 @@
smp->flags = SMP_F_CONST;
smp->data.type = SMP_T_STR;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8696,7 +8696,7 @@
struct connection *conn;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8734,7 +8734,7 @@
smp->flags = SMP_F_CONST;
smp->data.type = SMP_T_BIN;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8766,7 +8766,7 @@
struct buffer *data;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8803,7 +8803,7 @@
struct buffer *data;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
@@ -8961,7 +8961,7 @@
struct buffer *finished_trash;
struct ssl_sock_ctx *ctx;
- if (smp->sess && obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
+ if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] != 'b') ? cs_conn(__objt_check(smp->sess->origin)->cs) : NULL;
else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :