Attachment 925299 Details for Bug 1127992 – proposed patch for 1.11

[patch] proposed patch for 1.11

krb5-1.11-moretime.patch (text/plain), 1.96 KB, created by Nalin Dahyabhai on 2014-08-08 20:46:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nalin Dahyabhai

Created: 2014-08-08 20:46:12 UTC

Size: 1.96 KB

patch

obsolete

>An attempt at pulling the fix from RT#7604 in to 1.11, modified so
>that we raise the desired timeout for a TCP socket when we return from
>a WRITING state rather than when entering from a CONNECTING state.
>
>--- krb5-1.11.3/src/include/cm.h
>+++ krb5-1.11.3/src/include/cm.h
>@@ -85,6 +85,7 @@ struct conn_state {
>     } x;
>     krb5_data callback_buffer;
>     size_t server_index;
>+    int interval;
>     struct conn_state *next;
> };
> 
>--- krb5-1.11.3/src/lib/krb5/os/sendto_kdc.c
>+++ krb5-1.11.3/src/lib/krb5/os/sendto_kdc.c
>@@ -1056,6 +1056,8 @@ service_tcp_fd(krb5_context context, str
>             conn->x.in.pos = 0;
>             conn->x.in.n_left = 0;
>         }
>+        if (conn->interval == 0)
>+            conn->interval = 10;
>         return 0;
> 
>     case READING:
>@@ -1144,6 +1146,23 @@ service_udp_fd(krb5_context context, str
>     return 1;
> }
> 
>+/* Return the maximum of the timeout and a timeout for the currently active TCP
>+ * connections. */
>+static int
>+get_interval(int interval, struct conn_state *conns)
>+{
>+    struct conn_state *state;
>+
>+    for (state = conns; state != NULL; state = state->next) {
>+        if (state->socktype == SOCK_STREAM &&
>+            (state->state == READING || state->state == WRITING) &&
>+            state->interval > interval) {
>+            interval = state->interval;
>+        }
>+    }
>+    return interval;
>+}
>+
> static krb5_boolean
> service_fds(krb5_context context, struct select_state *selstate, int interval,
>             struct conn_state *conns, struct select_state *seltemp,
>@@ -1159,11 +1178,12 @@ service_fds(krb5_context context, struct
>     e = k5_getcurtime(&now);
>     if (e)
>         return 1;
>-    selstate->end_time = now;
>-    selstate->end_time.tv_sec += interval;
> 
>     e = 0;
>     while (selstate->nfds > 0) {
>+        selstate->end_time = now;
>+        selstate->end_time.tv_sec += get_interval(interval, conns);
>+
>         e = cm_select_or_poll(selstate, seltemp, &selret);
>         if (e == EINTR)
>             continue;

Actions: View | Diff

Attachments on bug 1127992: 925060 | 925299