X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_send.c;h=c01c6c96e91df812a835fb83b84c0cb2122277f5;hb=471684761a2039bbc89aa1e3c33c62de6bef86cf;hp=6c912951a964fdf73101381fe8f078ac4b699df6;hpb=dc4030458f9af07d5719cfbff0a47cd16f1847f7;p=paraslash.git diff --git a/http_send.c b/http_send.c index 6c912951..c01c6c96 100644 --- a/http_send.c +++ b/http_send.c @@ -1,19 +1,7 @@ /* * 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 */ @@ -98,7 +86,7 @@ struct access_info { /** the address to be black/whitelisted */ struct in_addr addr; /** the netmask for this entry */ - int netmask; + unsigned netmask; /** the position of this entry in the access_perm_list */ struct list_head node; }; @@ -207,7 +195,7 @@ static void http_send( long unsigned current_chunk, hc->status != HTTP_READY_TO_STREAM) continue; if (hc->status == HTTP_READY_TO_STREAM) { - int hlen; + unsigned hlen; char *hbuf = vss_get_header(&hlen); if (hbuf && hlen > 0 && current_chunk) { /* need to send header */ @@ -247,7 +235,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; }