X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=6c912951a964fdf73101381fe8f078ac4b699df6;hp=f06a5ac258e9a36c88cc9d9dd26acaede6fe2029;hb=5430c77f1fdf97d92796f44623d257b8124bde24;hpb=f269333700038603703ec79c909d514bee731faf diff --git a/http_send.c b/http_send.c index f06a5ac2..6c912951 100644 --- a/http_send.c +++ b/http_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include "server.cmdline.h" #include "server.h" #include "http.h" -#include "afs.h" +#include "vss.h" #include "send.h" #include "list.h" #include "close_on_fork.h" @@ -128,7 +128,7 @@ static void http_shutdown_clients(void) { struct http_client *hc, *tmp; list_for_each_entry_safe(hc, tmp, &clients, node) - http_shutdown_client(hc, "afs request"); + http_shutdown_client(hc, "vss request"); } static int http_send_msg(struct http_client *hc, const char *msg) @@ -208,7 +208,7 @@ static void http_send( long unsigned current_chunk, continue; if (hc->status == HTTP_READY_TO_STREAM) { int hlen; - char *hbuf = afs_get_header(&hlen); + char *hbuf = vss_get_header(&hlen); if (hbuf && hlen > 0 && current_chunk) { /* need to send header */ PARA_INFO_LOG("queueing header: %d\n", hlen); @@ -360,7 +360,7 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds) hc->check_w = 1; break; case HTTP_SENT_OK_MSG: - if (!afs_playing()) + if (!vss_playing()) break; /* wait until server starts playing */ para_fd_set(hc->fd, wfds, max_fileno); hc->check_w = 1;