[FFmpeg-cvslog] r10615 - trunk/libavformat/utils.c
andoma
subversion
Sat Sep 29 16:35:53 CEST 2007
Author: andoma
Date: Sat Sep 29 16:35:52 2007
New Revision: 10615
Log:
Add IPv6 support to url_split()
patch by: Ronald S. Bultje rsbultje a gmail d com
thread: "[PATCH] url_split() ipv6 support" at 2007/Sep/23 18:43
Modified:
trunk/libavformat/utils.c
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c (original)
+++ trunk/libavformat/utils.c Sat Sep 29 16:35:52 2007
@@ -2878,7 +2878,7 @@ void url_split(char *proto, int proto_si
char *path, int path_size,
const char *url)
{
- const char *p, *ls, *at, *col;
+ const char *p, *ls, *at, *col, *brk;
if (port_ptr) *port_ptr = -1;
if (proto_size > 0) proto[0] = 0;
@@ -2913,13 +2913,19 @@ void url_split(char *proto, int proto_si
p = at + 1; /* skip '@' */
}
- /* port */
- if ((col = strchr(p, ':')) && col < ls) {
- ls = col;
- if (port_ptr) *port_ptr = atoi(col + 1); /* skip ':' */
- }
-
- av_strlcpy(hostname, p, FFMIN(1 + ls - p, hostname_size));
+ if (*p == '[' && (brk = strchr(p, ']')) && brk < ls) {
+ /* [host]:port */
+ av_strlcpy(hostname, p + 1,
+ FFMIN(hostname_size, brk - p));
+ if (brk[1] == ':' && port_ptr)
+ *port_ptr = atoi(brk + 2);
+ } else if ((col = strchr(p, ':')) && col < ls) {
+ av_strlcpy(hostname, p,
+ FFMIN(col + 1 - p, hostname_size));
+ if (port_ptr) *port_ptr = atoi(col + 1);
+ } else
+ av_strlcpy(hostname, p,
+ FFMIN(ls + 1 - p, hostname_size));
}
}
More information about the ffmpeg-cvslog
mailing list