audiod: Fix status item parsing for long status items.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 136557adca486f65bdb38c592254461284148459..32047a1f9aae8d8c69adefe82e12a82e7bfcf00f 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -92,6 +92,7 @@ struct status_task {
        struct timeval restart_barrier;
        /** Last time we received status data from para_server. */
        struct timeval last_status_read;
        struct timeval restart_barrier;
        /** Last time we received status data from para_server. */
        struct timeval last_status_read;

+       size_t min_iqs;

        /** The offset value announced by para_server. */
        int offset_seconds;
        /** The length of the current audio file as announced by para_server. */
        /** The offset value announced by para_server. */
        int offset_seconds;
        /** The length of the current audio file as announced by para_server. */


@@ -1187,25 +1188,28 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
                }
                if (st->ct->status != CL_RECEIVING)
                        goto out;
                }
                if (st->ct->status != CL_RECEIVING)
                        goto out;

-               ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
-               if (ret <= 0)
+               ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
+               if (ret <= 0) {
+                       struct timeval diff;
+                       tv_diff(now, &st->last_status_read, &diff);
+                       if (diff.tv_sec > 61)
+                               kill_btrn(st->ct->btrn, &st->ct->task,
+                                       -E_STATUS_TIMEOUT);

                        goto out;
                        goto out;

+               }
+               btr_merge(st->btrn, st->min_iqs);

                sz = btr_next_buffer(st->btrn, &buf);
                ret = for_each_stat_item(buf, sz, update_item);
                if (ret < 0) {
                        kill_btrn(st->ct->btrn, &st->ct->task, ret);
                        goto out;
                }
                sz = btr_next_buffer(st->btrn, &buf);
                ret = for_each_stat_item(buf, sz, update_item);
                if (ret < 0) {
                        kill_btrn(st->ct->btrn, &st->ct->task, ret);
                        goto out;
                }

-               if (sz != ret)
+               if (sz != ret) {
+                       btr_consume(st->btrn, sz - ret);

                        st->last_status_read = *now;
                        st->last_status_read = *now;

-               else {
-                       struct timeval diff;
-                       tv_diff(now, &st->last_status_read, &diff);
-                       if (diff.tv_sec > 61)
-                               kill_btrn(st->ct->btrn, &st->ct->task,
-                                       -E_STATUS_TIMEOUT);
-               }
-               btr_consume(st->btrn, sz - ret);
+                       st->min_iqs = 0;
+               } else /* current status item crosses buffers */
+                       st->min_iqs = sz + 1;

                goto out;
        }
        if (tv_diff(now, &st->restart_barrier, NULL) < 0)
                goto out;
        }
        if (tv_diff(now, &st->restart_barrier, NULL) < 0)