differentiate between TLS messages and EAP-[T]TLS packets in the debug output

diff --git a/src/libcharon/plugins/eap_tls/eap_tls.c b/src/libcharon/plugins/eap_tls/eap_tls.c
index 2313aacdfb64589f12b36f6eb8ae9ad118e3126f..a2407e51d0c3617ef8d2940c6ca052e9e30adce7 100644 (file)
--- a/src/libcharon/plugins/eap_tls/eap_tls.c
+++ b/src/libcharon/plugins/eap_tls/eap_tls.c
@@ -120,7 +120,7 @@ METHOD(eap_method_t, initiate, status_t,
                do {
                        pkt.identifier = random();
                } while (!pkt.identifier);
-               DBG2(DBG_IKE, "sending TLS start packet");
+               DBG2(DBG_IKE, "sending EAP-TLS start packet");
 
                *out = eap_payload_create_data(chunk_from_thing(pkt));
                return NEED_MORE;
@@ -195,7 +195,7 @@ static eap_payload_t *create_ack(private_eap_tls_t *this, u_int8_t identifier)
                .type = EAP_TLS,
        };
        htoun16(&pkt.length, sizeof(pkt));
-       DBG2(DBG_IKE, "sending TLS acknowledgement packet");
+       DBG2(DBG_IKE, "sending EAP-TLS acknowledgement packet");
 
        return eap_payload_create_data(chunk_from_thing(pkt));
 }
@@ -231,7 +231,7 @@ static eap_payload_t *read_buf(private_eap_tls_t *this, u_int8_t identifier)
                        pkt_len += EAP_TLS_FRAGMENT_LEN;
                        memcpy(start, this->output.ptr + this->outpos, EAP_TLS_FRAGMENT_LEN);
                        this->outpos += EAP_TLS_FRAGMENT_LEN;
-                       DBG2(DBG_IKE, "sending TLS packet fragment");
+                       DBG2(DBG_IKE, "sending EAP-TLS packet fragment");
                }
                else
                {
@@ -240,12 +240,12 @@ static eap_payload_t *read_buf(private_eap_tls_t *this, u_int8_t identifier)
                                   this->output.len - this->outpos);
                        chunk_free(&this->output);
                        this->outpos = 0;
-                       DBG2(DBG_IKE, "sending TLS packet");
+                       DBG2(DBG_IKE, "sending EAP-TLS packet");
                }
        }
        else
        {
-               DBG2(DBG_IKE, "sending TLS acknowledgement packet");
+               DBG2(DBG_IKE, "sending EAP-TLS acknowledgement packet");
        }
        htoun16(&pkt->length, pkt_len);
        return eap_payload_create_data(chunk_create(buf, pkt_len));

diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls.c b/src/libcharon/plugins/eap_ttls/eap_ttls.c
index fa1d283f369cf3067c139d8a59848039d41566e4..1139a3f3dedca73962e0d18bd459c0914e73e428 100644 (file)
--- a/src/libcharon/plugins/eap_ttls/eap_ttls.c
+++ b/src/libcharon/plugins/eap_ttls/eap_ttls.c
@@ -121,7 +121,7 @@ METHOD(eap_method_t, initiate, status_t,
                do {
                        pkt.identifier = random();
                } while (!pkt.identifier);
-               DBG2(DBG_IKE, "sending TLS start packet");
+               DBG2(DBG_IKE, "sending EAP-TLS start packet");
 
                *out = eap_payload_create_data(chunk_from_thing(pkt));
                return NEED_MORE;
@@ -196,7 +196,7 @@ static eap_payload_t *create_ack(private_eap_ttls_t *this, u_int8_t identifier)
                .type = EAP_TTLS,
        };
        htoun16(&pkt.length, sizeof(pkt));
-       DBG2(DBG_IKE, "sending TLS acknowledgement packet");
+       DBG2(DBG_IKE, "sending EAP-TLS acknowledgement packet");
 
        return eap_payload_create_data(chunk_from_thing(pkt));
 }
@@ -232,7 +232,7 @@ static eap_payload_t *read_buf(private_eap_ttls_t *this, u_int8_t identifier)
                        pkt_len += EAP_TTLS_FRAGMENT_LEN;
                        memcpy(start, this->output.ptr + this->outpos, EAP_TTLS_FRAGMENT_LEN);
                        this->outpos += EAP_TTLS_FRAGMENT_LEN;
-                       DBG2(DBG_IKE, "sending TLS packet fragment");
+                       DBG2(DBG_IKE, "sending EAP-TLS packet fragment");
                }
                else
                {
@@ -241,12 +241,12 @@ static eap_payload_t *read_buf(private_eap_ttls_t *this, u_int8_t identifier)
                                   this->output.len - this->outpos);
                        chunk_free(&this->output);
                        this->outpos = 0;
-                       DBG2(DBG_IKE, "sending TLS packet");
+                       DBG2(DBG_IKE, "sending EAP-TLS packet");
                }
        }
        else
        {
-               DBG2(DBG_IKE, "sending TLS acknowledgement packet");
+               DBG2(DBG_IKE, "sending EAP-TLS acknowledgement packet");
        }
        htoun16(&pkt->length, pkt_len);
        return eap_payload_create_data(chunk_create(buf, pkt_len));
@@ -338,7 +338,7 @@ METHOD(eap_method_t, process, status_t,
        if (data.len < sizeof(eap_ttls_packet_t) ||
                untoh16(&pkt->length) != data.len)
        {
-               DBG1(DBG_IKE, "invalid EAP-TTLS packet length");
+               DBG1(DBG_IKE, "invalid EAP-TLS packet length");
                return FAILED;
        }
        if (pkt->flags & EAP_TTLS_START)