[onwire] rename kf_plink/kf_psize/kf_pdata to their respective more descriptive versions

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/libknet/onwire.h b/libknet/onwire.h
index 6e03a5a133816238f77f4be1f0c79495c7ae901b..5fe8431f7807b8c3c9170211e03c9d3b9ee4c140 100644 (file)
--- a/libknet/onwire.h
+++ b/libknet/onwire.h
@@ -156,9 +156,9 @@ struct knet_header {
 #define khp_ping_link     kh_payload.khp_ping.khp_ping_link
 #define khp_ping_time     kh_payload.khp_ping.khp_ping_time
 
-#define kf_plink   kh_payload.khp_pmtud.khp_pmtud_link
-#define kf_psize   kh_payload.khp_pmtud.khp_pmtud_size
-#define kf_pdata   kh_payload.khp_pmtud.khp_pmtud_data
+#define khp_pmtud_link    kh_payload.khp_pmtud.khp_pmtud_link
+#define khp_pmtud_size    kh_payload.khp_pmtud.khp_pmtud_size
+#define khp_pmtud_data    kh_payload.khp_pmtud.khp_pmtud_data
 
 /*
  * extra defines to avoid mingling with sizeof() too much

diff --git a/libknet/threads.c b/libknet/threads.c
index 72f35bebdadc2e9b4d05bd872195d52f2520c811..c8a80935e9a8570400f55e358ba50b16ff33a71d 100644 (file)
--- a/libknet/threads.c
+++ b/libknet/threads.c
@@ -399,7 +399,7 @@ static void _handle_recv_from_links(knet_handle_t knet_h, int sockfd)
                        log_debug(knet_h, KNET_SUB_LINK_T, "Unable to get mutex lock");
                        break;
                }
-               src_link->last_recv_mtu = knet_h->recv_from_links_buf->kf_psize;
+               src_link->last_recv_mtu = knet_h->recv_from_links_buf->khp_pmtud_size;
                pthread_cond_signal(&knet_h->pmtud_cond);
                pthread_mutex_unlock(&knet_h->pmtud_mutex);
                break;
@@ -750,7 +750,7 @@ static void _handle_check_pmtud(knet_handle_t knet_h, struct knet_host *dst_host
 
        dst_link->last_bad_mtu = 0;
 
-       knet_h->pmtudbuf->khp_ping_link = dst_link->link_id;
+       knet_h->pmtudbuf->khp_pmtud_link = dst_link->link_id;
 
        switch (dst_link->dst_addr.ss_family) {
                case AF_INET6:
@@ -816,7 +816,7 @@ restart:
                }
 
                onwire_len = data_len + overhead_len;
-               knet_h->pmtudbuf->kf_psize = onwire_len;
+               knet_h->pmtudbuf->khp_pmtud_size = onwire_len;
 
                if (crypto_encrypt_and_sign(knet_h,
                                            (const unsigned char *)knet_h->pmtudbuf,
@@ -831,7 +831,7 @@ restart:
 
        } else {
 
-               knet_h->pmtudbuf->kf_psize = onwire_len;
+               knet_h->pmtudbuf->khp_pmtud_size = onwire_len;
 
        }