Merge branch 'master' into ph3

admin/listclients.xsl

@@ -55,6 +55,8 @@
 								<thead>
 									<tr>
 										<td>IP</td>
+										<td>Username</td>
+										<td>Role</td>
 										<td>Sec. connected</td>
 										<td>User Agent</td>
 										<td>Action</td>
@@ -64,15 +66,12 @@
 									<xsl:variable name = "themount"><xsl:value-of select="@mount" /></xsl:variable>
 									<xsl:for-each select="listener">
 										<tr>
-											<td>
-												<xsl:value-of select="IP" />
-												<xsl:if test="username">
-													(<xsl:value-of select="username" />)
-												</xsl:if>
-											</td>
-											<td><xsl:value-of select="Connected" /></td>
-											<td><xsl:value-of select="UserAgent" /></td>
-											<td><a href="killclient.xsl?mount={$themount}&amp;id={ID}">Kick</a></td>
+											<td><xsl:value-of select="ip" /></td>
+											<td><xsl:value-of select="username" /></td>
+											<td><xsl:value-of select="role" /></td>
+											<td><xsl:value-of select="connected" /></td>
+											<td><xsl:value-of select="useragent" /></td>
+											<td><a href="killclient.xsl?mount={$themount}&amp;id={id}">Kick</a></td>
 										</tr>
 									</xsl:for-each>
 								</tbody>
@@ -92,4 +91,4 @@
 </body>
 </html>
 </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

src/cfgfile.c

@@ -1832,15 +1832,16 @@ static void _parse_paths(xmlDocPtr doc, xmlNodePtr node,
             alias = malloc(sizeof(aliases));
             alias->next = NULL;
             alias->source = (char *)xmlGetProp(node, XMLSTR("source"));
-            if(alias->source == NULL) {
-                free(alias);
-                continue;
-            }
             alias->destination = (char *)xmlGetProp(node, XMLSTR("destination"));
             if (!alias->destination)
                 alias->destination = (char *)xmlGetProp(node, XMLSTR("dest"));
-            if(alias->destination == NULL) {
+
+            if (!alias->source && alias->destination) {
+                alias->source = alias->destination;
+                alias->destination = NULL;
+            } else if(!alias->source && !alias->destination) {
                 xmlFree(alias->source);
+                xmlFree(alias->destination);
                 free(alias);
                 continue;
             }

src/connection.c

@@ -32,9 +32,6 @@
 #include <netinet/in.h>
 #else
 #include <winsock2.h>
-#define snprintf _snprintf
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
 #endif
 
 #include "compat.h"
@@ -1269,7 +1266,8 @@ static int _handle_aliases(client_t *client, char **uri) {
            (alias->port == -1 || alias->port == serverport) &&
            (alias->bind_address == NULL || (serverhost != NULL && strcmp(alias->bind_address, serverhost) == 0)) &&
            (alias->vhost == NULL || (vhost != NULL && strcmp(alias->vhost, vhost) == 0)) ) {
-            new_uri = strdup(alias->destination);
+            if (alias->destination)
+                new_uri = strdup(alias->destination);
             if (alias->omode != OMODE_DEFAULT)
                 client->mode = alias->omode;
             ICECAST_LOG_DEBUG("alias has made %s into %s", *uri, new_uri);

src/format.c

@@ -48,12 +48,6 @@
 #include "stats.h"
 #define CATMODULE "format"
 
-#ifdef WIN32
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#define snprintf _snprintf
-#endif
-
 static int format_prepare_headers (source_t *source, client_t *client);
 
 

src/format_mp3.c

@@ -41,12 +41,6 @@
 
 #include "format_mp3.h"
 
-#ifdef WIN32
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#define snprintf _snprintf
-#endif
-
 #define CATMODULE "format-mp3"
 
 /* Note that this seems to be 8192 in shoutcast - perhaps we want to be the

src/fserve.c

@@ -35,11 +35,8 @@
 #else
 #include <winsock2.h>
 #include <windows.h>
-#define fseeko fseek
 #define SCN_OFF_T "ld"
 #define PRI_OFF_T "ld"
-#define snprintf _snprintf
-#define strncasecmp _strnicmp
 #ifndef S_ISREG
 #define S_ISREG(mode)  ((mode) & _S_IFREG)
 #endif

src/main.c

@@ -21,8 +21,14 @@
 #include <string.h>
 #include <errno.h>
 
+#ifdef HAVE_CURL
+#include <curl/curl.h>
+#endif
+
 #ifdef WIN32
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0400
+#endif
 /* For getpid() */
 #include <process.h>
 #include <windows.h>
@@ -33,9 +39,6 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_CURL
-#include <curl/curl.h>
-#endif
 
 #ifdef HAVE_UNAME
 #include <sys/utsname.h>

src/md5.c

@@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[HASH_LEN], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (uint32_t *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     memcpy(digest, ctx->buf, HASH_LEN);
-    memset(ctx, 0, sizeof(ctx));
+    memset(ctx, 0, sizeof(*ctx));
 	/* In case it's sensitive */
 }
 

src/slave.c

@@ -32,9 +32,6 @@
 #include <netinet/in.h>
 #else
 #include <winsock2.h>
-#define snprintf _snprintf
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
 #endif
 
 #include "compat.h"

src/util.c

@@ -31,9 +31,6 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <stdio.h>
-#define snprintf _snprintf
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
 #endif
 
 #include "common/net/sock.h"