X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=d09306be2ad903045388fc49518bd06b5c28d228;hp=f06a5ac258e9a36c88cc9d9dd26acaede6fe2029;hb=4b950b07a628025f62240ba385504431c216c9fa;hpb=f269333700038603703ec79c909d514bee731faf diff --git a/http_send.c b/http_send.c index f06a5ac2..d09306be 100644 --- a/http_send.c +++ b/http_send.c @@ -1,19 +1,7 @@ /* - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file http_send.c paraslash's http sender */ @@ -22,7 +10,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" @@ -38,75 +26,80 @@ #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n" /** \endcond */ -/** the possible states of a client from the server's POV */ +/** The possible states of a client from the server's POV. */ enum http_status { + /** We accepted the connection on the tcp socket. */ HTTP_CONNECTED, + /** Successfully received the get request. */ HTTP_GOT_GET_REQUEST, + /** We sent the OK message back to the client. */ HTTP_SENT_OK_MSG, + /** Connection established, we might need to send the audio file header. */ HTTP_READY_TO_STREAM, + /** Connection is ready for sending audio data. */ HTTP_STREAMING, + /** We didn't receive a valid get request. */ HTTP_INVALID_GET_REQUEST }; -/** clients will be kicked if there are more than that many bytes pending */ +/** Clients will be kicked if there are more than that many bytes pending. */ #define MAX_BACKLOG 40000 -/** the list of connected clients **/ +/** The list of connected clients. */ static struct list_head clients; -/** the whitelist/blacklist */ +/** The whitelist/blacklist. */ static struct list_head access_perm_list; -/** describes one client that connected the tcp port of the http sender */ +/** Describes one client that connected the tcp port of the http sender. */ struct http_client { -/** the file descriptor of the client */ + /** The file descriptor of the client. */ int fd; -/** address information about the client */ + /** Address information about the client. */ struct sockaddr_in addr; -/** the client's current status */ + /** The client's current status. */ enum http_status status; -/** non-zero if we included \a fd in the read set */ + /** Non-zero if we included \a fd in the read set.*/ int check_r; -/** non-zero if we included \a fd in the write set */ + /** Non-zero if we included \a fd in the write set. */ int check_w; -/** the position of this client in the client list */ + /** The position of this client in the client list. */ struct list_head node; -/** the list of pending packets for this client */ + /** Te list of pending packets for this client. */ struct list_head packet_queue; -/** the number of pending bytes for this client */ + /** The number of pending bytes for this client. */ unsigned long pq_bytes; }; /** - * describes one queued data packet for a client + * Describes one queued data packet for a client. * * The send function of the http sender checks each client fd for writing. If a * client fd is not ready, it tries to queue that packet for this client until * the number of queued bytes exceeds \p MAX_BACKLOG. */ struct queued_packet { -/** the length of the packet in bytes */ + /** The length of the packet in bytes. */ unsigned int len; -/** pointer to the packet data */ + /** Pointer to the packet data. */ char *packet; -/** position of the packet in the packet list */ + /** Position of the packet in the packet list. */ struct list_head node; }; /** - * describes one entry in the blacklist/whitelist of the http sender + * Describes one entry in the blacklist/whitelist of the http sender. */ struct access_info { - /** the address to be black/whitelisted */ + /** The address to be black/whitelisted. */ struct in_addr addr; - /** the netmask for this entry */ - int netmask; - /** the position of this entry in the access_perm_list */ + /** The netmask for this entry. */ + unsigned netmask; + /** The position of this entry in the access_perm_list. */ struct list_head node; }; static int server_fd = -1, numclients; static struct sender *self; - static void http_shutdown_client(struct http_client *hc, const char *msg) { struct queued_packet *qp, *tmp; @@ -128,7 +121,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) @@ -207,8 +200,8 @@ static void http_send( long unsigned current_chunk, hc->status != HTTP_READY_TO_STREAM) continue; if (hc->status == HTTP_READY_TO_STREAM) { - int hlen; - char *hbuf = afs_get_header(&hlen); + unsigned 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); @@ -247,7 +240,7 @@ static int host_in_access_perm_list(struct http_client *hc) { struct access_info *ai, *tmp; list_for_each_entry_safe(ai, tmp, &access_perm_list, node) { - unsigned mask = ((~0) >> ai->netmask); + unsigned mask = ((~0U) >> ai->netmask); if ((hc->addr.sin_addr.s_addr & mask) == (ai->addr.s_addr & mask)) return 1; } @@ -360,7 +353,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; @@ -530,12 +523,12 @@ static char *http_help(void) } /** - * the init function of the http sender + * The init function of the http sender. * - * \param s pointer to the http sender struct + * \param s Pointer to the http sender struct. * - * It initializes all function pointers of \a s, init the client list and the - * acess control list as well. If autostart is wanted, open the tcp port. + * It initializes all function pointers of \a s, the client list and the access + * control list. If the autostart option was given, the tcp port is opened. */ void http_send_init(struct sender *s) {