From ee222531c802531a1ac0a74c933dfdfa48e8ed9e Mon Sep 17 00:00:00 2001 From: "Robbie Harwood (frozencemetery)" Date: Mon, 22 Jul 2013 16:11:41 -0400 Subject: Remove is_udp field in sendto_kdc.c conn_state This field is redundant with addr.type. [ghudson@mit.edu: removed extraneous changes; clarified commit message] --- src/lib/krb5/os/sendto_kdc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/lib') diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index 3c31d9f55d..ecea68f005 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -89,7 +89,6 @@ struct incoming_krb5_message { struct conn_state { SOCKET fd; enum conn_states state; - unsigned int is_udp : 1; int (*service)(krb5_context context, struct conn_state *, struct select_state *, int); struct remote_address addr; @@ -432,8 +431,7 @@ set_conn_state_msg_length (struct conn_state *state, const krb5_data *message) if (!message || message->length == 0) return; - if (!state->is_udp) { - + if (state->addr.type == SOCK_STREAM) { store_32_be(message->length, state->x.out.msg_len_buf); SG_SET(&state->x.out.sgbuf[0], state->x.out.msg_len_buf, 4); SG_SET(&state->x.out.sgbuf[1], message->data, message->length); @@ -473,7 +471,6 @@ add_connection(struct conn_state **conns, struct addrinfo *ai, state->x.out.sg_count = 2; */ - state->is_udp = 0; state->service = service_tcp_fd; set_conn_state_msg_length (state, message); } else { @@ -483,7 +480,6 @@ add_connection(struct conn_state **conns, struct addrinfo *ai, state->x.out.sg_count = 1; */ - state->is_udp = 1; state->service = service_udp_fd; set_conn_state_msg_length (state, message); -- cgit