Trace log with a subset of struct conn_state

In struct conn_state, collect together the fields for the remote
address and put them in a substructure.  Pass this substructure to
trace logging macros instead of the entire conn_state structure, so
that trace.c doesn't have to know about the whole structure.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/include/cm.h b/src/include/cm.h
index d9c23fce1f..837a549b0c 100644
--- a/src/include/cm.h
+++ b/src/include/cm.h
@@ -63,6 +63,12 @@ struct incoming_krb5_message {
     unsigned char bufsizebytes[4];
     size_t n_left;
 };
+struct remote_address {
+    int family;
+    int type;
+    socklen_t len;
+    struct sockaddr_storage saddr;
+};
 struct conn_state {
     SOCKET fd;
     krb5_error_code err;
@@ -70,10 +76,7 @@ struct conn_state {
     unsigned int is_udp : 1;
     int (*service)(krb5_context context, struct conn_state *,
                    struct select_state *, int);
-    int socktype;
-    int family;
-    size_t addrlen;
-    struct sockaddr_storage addr;
+    struct remote_address addr;
     struct {
         struct {
             sg_buf sgbuf[2];