C: jeanphi
D: Bug fixes
+N: Alexis Guillard
+E: alexis.guillard@bt.com
+D: IPv6
+
N: Shane Harper
E: shanegh@optusnet.com.au
D: SDL plugin fixes and enhancements
mpeg_adec/mpeg_adec \
mpeg_vdec/mpeg_vdec \
network/ipv4 \
+ network/ipv6 \
qnx/qnx \
qt/qt \
sdl/sdl \
PLUGINS="${PLUGINS} null"
fi
+cat > conftest.$ac_ext <<EOF
+#line 6581 "configure"
+#include "confdefs.h"
+#include <netinet/in.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "in6_addr" >/dev/null 2>&1; then
+ rm -rf conftest*
+
+ PLUGINS="${PLUGINS} ipv6"
+fi
+rm -f conftest*
+
+
# Check whether --enable-rc or --disable-rc was given.
if test "${enable_rc+set}" = set; then
enableval="$enable_rc"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6610: checking for $ac_hdr" >&5
+echo "configure:6624: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6615 "configure"
+#line 6629 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
done
echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6650: checking for mad_bit_init in -lmad" >&5
+echo "configure:6664: checking for mad_bit_init in -lmad" >&5
ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lmad $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6658 "configure"
+#line 6672 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
mad_bit_init()
; return 0; }
EOF
-if { (eval echo configure:6669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6726: checking for $ac_hdr" >&5
+echo "configure:6740: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6731 "configure"
+#line 6745 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
PLUGINS="${PLUGINS} dsp"
echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-echo "configure:6759: checking for main in -lossaudio" >&5
+echo "configure:6773: checking for main in -lossaudio" >&5
ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lossaudio $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6767 "configure"
+#line 6781 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6810: checking for $ac_word" >&5
+echo "configure:6824: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6861: checking for $ac_word" >&5
+echo "configure:6875: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6919: checking for $ac_hdr" >&5
+echo "configure:6933: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6924 "configure"
+#line 6938 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6974: checking for $ac_hdr" >&5
+echo "configure:6988: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6979 "configure"
+#line 6993 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7027: checking for $ac_hdr" >&5
+echo "configure:7041: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7032 "configure"
+#line 7046 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
# Extract the first word of "sdl12-config", so it can be a program name with args.
set dummy sdl12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7125: checking for $ac_word" >&5
+echo "configure:7139: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sdl11-config", so it can be a program name with args.
set dummy sdl11-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7165: checking for $ac_word" >&5
+echo "configure:7179: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7206: checking for $ac_word" >&5
+echo "configure:7220: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7252: checking for $ac_hdr" >&5
+echo "configure:7266: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7257 "configure"
+#line 7271 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7332: checking for $ac_hdr" >&5
+echo "configure:7346: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7337 "configure"
+#line 7351 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
else
echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
-echo "configure:7371: checking for directX headers in ${withval}" >&5
+echo "configure:7385: checking for directX headers in ${withval}" >&5
if test -f ${withval}/ddraw.h
then
PLUGINS="${PLUGINS} directx"
# Extract the first word of "gnome-config", so it can be a program name with args.
set dummy gnome-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7480: checking for $ac_word" >&5
+echo "configure:7494: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7525: checking for $ac_hdr" >&5
+echo "configure:7539: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7530 "configure"
+#line 7544 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
# Extract the first word of "gtk12-config", so it can be a program name with args.
set dummy gtk12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7595: checking for $ac_word" >&5
+echo "configure:7609: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7634: checking for $ac_word" >&5
+echo "configure:7648: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7684: checking for $ac_hdr" >&5
+echo "configure:7698: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7689 "configure"
+#line 7703 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7752: checking for $ac_hdr" >&5
+echo "configure:7766: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7757 "configure"
+#line 7771 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7815: checking for $ac_hdr" >&5
+echo "configure:7829: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7820 "configure"
+#line 7834 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
saved_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
-echo "configure:7849: checking for XvSetPortAttribute in -lXv_pic" >&5
+echo "configure:7863: checking for XvSetPortAttribute in -lXv_pic" >&5
ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lXv_pic $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7857 "configure"
+#line 7871 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XvSetPortAttribute()
; return 0; }
EOF
-if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
then
ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6
-echo "configure:7915: checking for lirc/lirc_client.h" >&5
+echo "configure:7929: checking for lirc/lirc_client.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7920 "configure"
+#line 7934 "configure"
#include "confdefs.h"
#include <lirc/lirc_client.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6
-echo "configure:7942: checking for lirc_init in -llirc_client" >&5
+echo "configure:7956: checking for lirc_init in -llirc_client" >&5
ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-llirc_client $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7950 "configure"
+#line 7964 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
lirc_init()
; return 0; }
EOF
-if { (eval echo configure:7961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
then
ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
-echo "configure:8001: checking for alsa/asoundlib.h" >&5
+echo "configure:8015: checking for alsa/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8006 "configure"
+#line 8020 "configure"
#include "confdefs.h"
#include <alsa/asoundlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:8028: checking for main in -lasound" >&5
+echo "configure:8042: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8036 "configure"
+#line 8050 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
PLUGINS="${PLUGINS} null"
fi
+dnl
+dnl ipv6 plugin
+dnl
+AC_EGREP_HEADER(in6_addr,netinet/in.h,[
+ PLUGINS="${PLUGINS} ipv6"])
+
dnl
dnl rc plugin
dnl
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.83 2002/03/03 04:37:29 sam Exp $
+ * $Id: common.h,v 1.84 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
struct pes_packet_s * );
struct es_descriptor_s * ( * input_ParsePS ) ( struct input_thread_s *,
struct data_packet_s * );
+ ssize_t ( * input_ReadPS ) ( struct input_thread_s *,
+ struct data_packet_s ** );
void ( * input_DemuxPS ) ( struct input_thread_s *,
struct data_packet_s * );
+ ssize_t ( * input_ReadTS ) ( struct input_thread_s *,
+ struct data_packet_s ** );
void ( * input_DemuxTS ) ( struct input_thread_s *,
struct data_packet_s * );
void ( * input_DemuxPSI ) ( struct input_thread_s *,
#define INPUT_DVD_DEVICE_VAR "dvd_device"
/* VCD defaults */
#define INPUT_VCD_DEVICE_VAR "vcd_device"
+/* IPv6, IPv4 */
+#define INPUT_IPV6_VAR "6"
+#define INPUT_IPV4_VAR "4"
/*
* Decoders option names
* but exported to plug-ins
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
- * $Id: input_ext-plugins.h,v 1.20 2002/03/02 03:53:54 xav Exp $
+ * $Id: input_ext-plugins.h,v 1.21 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* Constants
*****************************************************************************/
#define TS_PACKET_SIZE 188 /* Size of a TS packet */
+#define TS_SYNC_CODE 0x47 /* First byte of a TS packet */
#define PSI_SECTION_SIZE 4096 /* Maximum size of a PSI section */
#define PAT_UNINITIALIZED (1 << 6)
void input_ParsePES ( struct input_thread_s *, struct es_descriptor_s * );
void input_GatherPES ( struct input_thread_s *, struct data_packet_s *,
struct es_descriptor_s *, boolean_t, boolean_t );
+ssize_t input_ReadPS ( struct input_thread_s *, struct data_packet_s ** );
es_descriptor_t * input_ParsePS( struct input_thread_s *,
struct data_packet_s * );
+ssize_t input_ReadTS ( struct input_thread_s *, struct data_packet_s ** );
void input_DemuxPS ( struct input_thread_s *, struct data_packet_s * );
void input_DemuxTS ( struct input_thread_s *, struct data_packet_s * );
void input_DemuxPSI ( struct input_thread_s *, struct data_packet_s *,
#else
# define input_ParsePES p_symbols->input_ParsePES
# define input_GatherPES p_symbols->input_GatherPES
+# define input_ReadPS p_symbols->input_ReadPS
# define input_ParsePS p_symbols->input_ParsePS
# define input_DemuxPS p_symbols->input_DemuxPS
+# define input_ReadTS p_symbols->input_ReadTS
# define input_DemuxTS p_symbols->input_DemuxTS
# define input_DemuxPSI p_symbols->input_DemuxPSI
#endif
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.1 2002/03/01 00:33:18 massiot Exp $
+ * $Id: http.c,v 1.2 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
}
p_access_data->psz_network = NULL;
+ if( config_GetIntVariable( INPUT_IPV4_VAR ) )
+ {
+ p_access_data->psz_network = "ipv4";
+ }
+ if( config_GetIntVariable( INPUT_IPV6_VAR ) )
+ {
+ p_access_data->psz_network = "ipv6";
+ }
if( p_input->psz_access != NULL )
{
/* Find out which shortcut was used */
* udp.c: raw UDP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.1 2002/03/01 00:33:18 massiot Exp $
+ * $Id: udp.c,v 1.2 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
int i_bind_port = 0, i_server_port = 0;
network_socket_t socket_desc;
+ if( config_GetIntVariable( INPUT_IPV4_VAR ) )
+ {
+ psz_network = "ipv4";
+ }
+ if( config_GetIntVariable( INPUT_IPV6_VAR ) )
+ {
+ psz_network = "ipv6";
+ }
+
if( p_input->psz_access != NULL )
{
/* Find out which shortcut was used */
while( *psz_parser && *psz_parser != ':' && *psz_parser != '@' )
{
+ if( *psz_parser == '[' )
+ {
+ /* IPv6 address */
+ while( *psz_parser && *psz_parser != ']' )
+ {
+ psz_parser++;
+ }
+ }
psz_parser++;
}
if( *psz_parser == '@' )
{
/* Found bind address or bind port */
- *psz_parser = '\0'; /* Terminate server port or name if necessary */ psz_parser++;
+ *psz_parser = '\0'; /* Terminate server port or name if necessary */
+ psz_parser++;
if( *psz_parser && *psz_parser != ':' )
{
while( *psz_parser && *psz_parser != ':' )
{
+ if( *psz_parser == '[' )
+ {
+ /* IPv6 address */
+ while( *psz_parser && *psz_parser != ']' )
+ {
+ psz_parser++;
+ }
+ }
psz_parser++;
}
}
* mpeg_ps.c : Program Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ps.c,v 1.4 2002/03/01 00:33:18 massiot Exp $
+ * $Id: mpeg_ps.c,v 1.5 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#undef input
}
-/*
- * Data reading functions
- */
-
-/*****************************************************************************
- * PSRead: reads one PS packet
- *****************************************************************************/
-#define PEEK( SIZE ) \
- i_error = input_Peek( p_input, &p_peek, SIZE ); \
- if( i_error == -1 ) \
- { \
- return( -1 ); \
- } \
- else if( i_error < SIZE ) \
- { \
- /* EOF */ \
- return( 0 ); \
- }
-
-static __inline__ ssize_t PSRead( input_thread_t * p_input,
- data_packet_t ** pp_data )
-{
- byte_t * p_peek;
- size_t i_packet_size;
- ssize_t i_error, i_read;
-
- /* Read what we believe to be a packet header. */
- PEEK( 4 );
-
- if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
- {
- if( *p_peek || *(p_peek + 1) || *(p_peek + 2) )
- {
- /* It is common for MPEG-1 streams to pad with zeros
- * (although it is forbidden by the recommendation), so
- * don't bother everybody in this case. */
- intf_WarnMsg( 3, "input warning: garbage at input (0x%x%x%x%x)",
- *p_peek, *(p_peek + 1), *(p_peek + 2), *(p_peek + 3) );
- }
-
- /* This is not the startcode of a packet. Read the stream
- * until we find one. */
- while( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
- {
- p_input->p_current_data++;
- PEEK( 4 );
- }
- /* Packet found. */
- }
-
- /* 0x1B9 == SYSTEM_END_CODE, it is only 4 bytes long. */
- if( p_peek[3] != 0xB9 )
- {
- /* The packet is at least 6 bytes long. */
- PEEK( 6 );
-
- if( p_peek[3] != 0xBA )
- {
- /* That's the case for all packets, except pack header. */
- i_packet_size = (p_peek[4] << 8) | p_peek[5];
- }
- else
- {
- /* Pack header. */
- if( (p_peek[4] & 0xC0) == 0x40 )
- {
- /* MPEG-2 */
- i_packet_size = 8;
- }
- else if( (p_peek[4] & 0xF0) == 0x20 )
- {
- /* MPEG-1 */
- i_packet_size = 6;
- }
- else
- {
- intf_ErrMsg( "Unable to determine stream type" );
- return( -1 );
- }
- }
- }
- else
- {
- /* System End Code */
- i_packet_size = -2;
- }
-
- /* Fetch a packet of the appropriate size. */
- i_read = input_SplitBuffer( p_input, pp_data, i_packet_size + 6 );
- if( i_read <= 0 )
- {
- return( i_read );
- }
-
- /* In MPEG-2 pack headers we still have to read stuffing bytes. */
- if( ((*pp_data)->p_demux_start[3] == 0xBA) && (i_packet_size == 8) )
- {
- size_t i_stuffing = ((*pp_data)->p_demux_start[13] & 0x7);
- /* Force refill of the input buffer - though we don't care
- * about p_peek. Please note that this is unoptimized. */
- PEEK( i_stuffing );
- p_input->p_current_data += i_stuffing;
- }
-
- return( 1 );
-}
-
/*****************************************************************************
* PSInit: initializes PS structures
*****************************************************************************/
ssize_t i_result;
data_packet_t * p_data;
- i_result = PSRead( p_input, &p_data );
+ i_result = input_ReadPS( p_input, &p_data );
if( i_result == 0 )
{
data_packet_t * p_data;
ssize_t i_result;
- i_result = PSRead( p_input, &p_data );
+ i_result = input_ReadPS( p_input, &p_data );
if( i_result <= 0 )
{
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ts.c,v 1.4 2002/03/01 00:33:18 massiot Exp $
+ * $Id: mpeg_ts.c,v 1.5 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
*
* Constants
*****************************************************************************/
#define TS_READ_ONCE 200
-#define TS_PACKET_SIZE 188
-#define TS_SYNC_CODE 0x47
/*****************************************************************************
* Local prototypes
* Returns -1 in case of error, 0 in case of EOF, otherwise the number of
* packets.
*****************************************************************************/
-#define PEEK( SIZE ) \
- i_error = input_Peek( p_input, &p_peek, SIZE ); \
- if( i_error == -1 ) \
- { \
- return( -1 ); \
- } \
- else if( i_error < SIZE ) \
- { \
- /* EOF */ \
- return( 0 ); \
- }
-
static int TSDemux( input_thread_t * p_input )
{
int i_read_once = (p_input->i_mtu ?
for( i = 0; i < i_read_once; i++ )
{
data_packet_t * p_data;
- ssize_t i_read, i_error;
- byte_t * p_peek;
-
- PEEK( 1 );
-
- if( *p_peek != TS_SYNC_CODE )
- {
- intf_WarnMsg( 3, "input warning: garbage at input (%x)", *p_peek );
-
- if( p_input->i_mtu )
- {
- /* Try to resync on next packet. */
- PEEK( TS_PACKET_SIZE );
- p_input->p_current_data += TS_PACKET_SIZE;
- }
- else
- {
- /* Move forward until we find 0x47 (and hope it's the good
- * one... FIXME) */
- while( *p_peek != TS_SYNC_CODE )
- {
- p_input->p_current_data++;
- PEEK( 1 );
- }
- }
- }
+ ssize_t i_result;
- i_read = input_SplitBuffer( p_input, &p_data, TS_PACKET_SIZE );
+ i_result = input_ReadTS( p_input, &p_data );
- if( i_read <= 0 )
+ if( i_result <= 0 )
{
- return( i_read );
+ return( i_result );
}
input_DemuxTS( p_input, p_data );
ipv4_SOURCES = ipv4.c
+ipv6_SOURCES = ipv6.c
* ipv4.c: IPv4 network abstraction layer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: ipv4.c,v 1.3 2002/03/02 03:53:55 xav Exp $
+ * $Id: ipv4.c,v 1.4 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Mathias Kretschmer <mathias@research.att.com>
*
* 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
int i_bind_port = p_socket->i_bind_port;
char * psz_server_addr = p_socket->psz_server_addr;
int i_server_port = p_socket->i_server_port;
- char * psz_bind_win32; /* WIN32 multicast kludge */
+#ifdef WIN32
+ char * psz_bind_win32; /* WIN32 multicast kludge */
+#endif
int i_handle, i_opt, i_opt_size;
struct sockaddr_in sock;
if (IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) )
{
- psz_bind_win32 = NULL ;
+ psz_bind_win32 = NULL ;
}
if ( BuildAddr( &sock, psz_bind_win32, i_bind_port ) == -1 )
#else
- if ( BuildAddr( &sock, psz_bind_addr, i_bind_port ) == -1 )
-#endif
+ if ( BuildAddr( &sock, psz_bind_addr, i_bind_port ) == -1 )
+#endif
{
close( i_handle );
return( -1 );
struct ip_mreq imr;
imr.imr_interface.s_addr = INADDR_ANY;
imr.imr_multiaddr.s_addr = inet_addr(psz_bind_addr);
-#endif
+#endif
if( setsockopt( i_handle, IPPROTO_IP, IP_ADD_MEMBERSHIP,
(char*)&imr, sizeof(struct ip_mreq) ) == -1 )
{
--- /dev/null
+/*****************************************************************************
+ * ipv6.c: IPv6 network abstraction layer
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: ipv6.c,v 1.1 2002/03/04 23:56:37 massiot Exp $
+ *
+ * Authors: Alexis Guillard <alexis.guillard@bt.com>
+ * Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <videolan/vlc.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#elif defined( _MSC_VER ) && defined( _WIN32 )
+# include <io.h>
+#endif
+
+#ifdef WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
+# include <netdb.h> /* hostent ... */
+# include <sys/socket.h>
+# include <netinet/in.h>
+# ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
+# endif
+#endif
+
+#include "network.h"
+
+/* Default MTU used for UDP socket. FIXME: we should issue some ioctl()
+ * call to get that value from the interface driver. */
+#define DEFAULT_MTU 1500
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static void getfunctions( function_list_t * );
+static int NetworkOpen( struct network_socket_s * );
+
+/*****************************************************************************
+ * Build configuration tree.
+ *****************************************************************************/
+MODULE_CONFIG_START
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
+ SET_DESCRIPTION( "IPv6 network abstraction layer" )
+ ADD_CAPABILITY( NETWORK, 40 )
+ ADD_SHORTCUT( "ipv6" )
+MODULE_INIT_STOP
+
+MODULE_ACTIVATE_START
+ getfunctions( &p_module->p_functions->network );
+MODULE_ACTIVATE_STOP
+
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP
+
+/*****************************************************************************
+ * Functions exported as capabilities. They are declared as static so that
+ * we don't pollute the namespace too much.
+ *****************************************************************************/
+static void getfunctions( function_list_t * p_function_list )
+{
+#define f p_function_list->functions.network
+ f.pf_open = NetworkOpen;
+#undef f
+}
+
+/*****************************************************************************
+ * BuildAddr: utility function to build a struct sockaddr_in6
+ *****************************************************************************/
+static int BuildAddr( struct sockaddr_in6 * p_socket,
+ char * psz_address, int i_port )
+{
+ /* Reset struct */
+ memset( p_socket, 0, sizeof( struct sockaddr_in6 ) );
+ p_socket->sin6_family = AF_INET6; /* family */
+ p_socket->sin6_port = htons( i_port );
+ if( psz_address == NULL )
+ {
+ p_socket->sin6_addr = in6addr_any;
+ }
+ else if( *psz_address != '['
+ || psz_address[strlen(psz_address) - 1] != ']' )
+ {
+ intf_ErrMsg( "ipv6: IPv6 address is invalid, discarding" );
+ return( -1 );
+ }
+ else
+ {
+ psz_address++;
+ psz_address[strlen(psz_address) - 1] = '\0' ;
+ inet_pton(AF_INET6, psz_address, &p_socket->sin6_addr.s6_addr);
+ }
+ return( 0 );
+}
+
+/*****************************************************************************
+ * OpenUDP: open a UDP socket
+ *****************************************************************************
+ * psz_bind_addr, i_bind_port : address and port used for the bind()
+ * system call. If psz_bind_addr == NULL, the socket is bound to
+ * in6addr_any and broadcast reception is enabled. If i_bind_port == 0,
+ * 1234 is used. If psz_bind_addr is a multicast (class D) address,
+ * join the multicast group.
+ * psz_server_addr, i_server_port : address and port used for the connect()
+ * system call. It can avoid receiving packets from unauthorized IPs.
+ * Its use leads to great confusion and is currently discouraged.
+ * This function returns -1 in case of error.
+ *****************************************************************************/
+static int OpenUDP( network_socket_t * p_socket )
+{
+ char * psz_bind_addr = p_socket->psz_bind_addr;
+ int i_bind_port = p_socket->i_bind_port;
+ char * psz_server_addr = p_socket->psz_server_addr;
+ int i_server_port = p_socket->i_server_port;
+
+ int i_handle, i_opt, i_opt_size;
+ struct sockaddr_in6 sock;
+
+ if( i_bind_port == 0 )
+ {
+ i_bind_port = config_GetIntVariable( INPUT_PORT_VAR );
+ }
+
+ /* Open a SOCK_DGRAM (UDP) socket, in the AF_INET6 domain, automatic (0)
+ * protocol */
+ if( (i_handle = socket( AF_INET6, SOCK_DGRAM, 0 )) == -1 )
+ {
+ intf_ErrMsg( "ipv6 error: cannot create socket (%s)", strerror(errno) );
+ return( -1 );
+ }
+
+ /* We may want to reuse an already used socket */
+ i_opt = 1;
+ if( setsockopt( i_handle, SOL_SOCKET, SO_REUSEADDR,
+ (void *) &i_opt, sizeof( i_opt ) ) == -1 )
+ {
+ intf_ErrMsg( "ipv6 error: cannot configure socket (SO_REUSEADDR: %s)",
+ strerror(errno));
+ close( i_handle );
+ return( -1 );
+ }
+
+ /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s) to avoid
+ * packet loss caused by scheduling problems */
+ i_opt = 0x80000;
+ if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
+ (void *) &i_opt, sizeof( i_opt ) ) == -1 )
+ {
+ intf_WarnMsg( 1,
+ "ipv6 warning: cannot configure socket (SO_RCVBUF: %s)",
+ strerror(errno));
+ }
+
+ /* Check if we really got what we have asked for, because Linux, etc.
+ * will silently limit the max buffer size to net.core.rmem_max which
+ * is typically only 65535 bytes */
+ i_opt = 0;
+ i_opt_size = sizeof( i_opt );
+ if( getsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
+ (void*) &i_opt, &i_opt_size ) == -1 )
+ {
+ intf_WarnMsg( 1, "ipv6 warning: cannot query socket (SO_RCVBUF: %s)",
+ strerror(errno));
+ }
+ else if( i_opt < 0x80000 )
+ {
+ intf_WarnMsg( 1, "ipv6 warning: socket buffer size is 0x%x"
+ " instead of 0x%x", i_opt, 0x80000 );
+ }
+
+ /* Build the local socket */
+ if ( BuildAddr( &sock, psz_bind_addr, i_bind_port ) == -1 )
+ {
+ close( i_handle );
+ return( -1 );
+ }
+
+ /* Bind it */
+ if( bind( i_handle, (struct sockaddr *)&sock, sizeof( sock ) ) < 0 )
+ {
+ intf_ErrMsg( "ipv6 error: cannot bind socket (%s)", strerror(errno) );
+ close( i_handle );
+ return( -1 );
+ }
+
+ /* Allow broadcast reception if we bound on in6addr_any */
+ if( psz_bind_addr == NULL )
+ {
+ i_opt = 1;
+ if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST,
+ (void*) &i_opt, sizeof( i_opt ) ) == -1 )
+ {
+ intf_WarnMsg( 1,
+ "ipv6 warning: cannot configure socket (SO_BROADCAST: %s)",
+ strerror(errno));
+ }
+ }
+
+ /* Join the multicast group if the socket is a multicast address */
+ /* FIXME: To be written */
+
+ if( psz_server_addr != NULL )
+ {
+ /* Build socket for remote connection */
+ if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
+ {
+ intf_ErrMsg( "ipv6 error: cannot build remote address" );
+ close( i_handle );
+ return( -1 );
+ }
+
+ /* Connect the socket */
+ if( connect( i_handle, (struct sockaddr *) &sock,
+ sizeof( sock ) ) == (-1) )
+ {
+ intf_ErrMsg( "ipv6 error: cannot connect socket (%s)",
+ strerror(errno) );
+ close( i_handle );
+ return( -1 );
+ }
+ }
+
+ p_socket->i_handle = i_handle;
+ p_socket->i_mtu = DEFAULT_MTU;
+ return( 0 );
+}
+
+/*****************************************************************************
+ * OpenTCP: open a TCP socket
+ *****************************************************************************
+ * psz_server_addr, i_server_port : address and port used for the connect()
+ * system call. If i_server_port == 0, 80 is used.
+ * Other parameters are ignored.
+ * This function returns -1 in case of error.
+ *****************************************************************************/
+static int OpenTCP( network_socket_t * p_socket )
+{
+ char * psz_server_addr = p_socket->psz_server_addr;
+ int i_server_port = p_socket->i_server_port;
+
+ int i_handle;
+ struct sockaddr_in6 sock;
+
+ if( i_server_port == 0 )
+ {
+ i_server_port = 80;
+ }
+
+ /* Open a SOCK_STREAM (TCP) socket, in the AF_INET6 domain, automatic (0)
+ * protocol */
+ if( (i_handle = socket( AF_INET6, SOCK_STREAM, 0 )) == -1 )
+ {
+ intf_ErrMsg( "ipv6 error: cannot create socket (%s)", strerror(errno) );
+ return( -1 );
+ }
+
+ /* Build remote address */
+ if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
+ {
+ close( i_handle );
+ return( -1 );
+ }
+
+ /* Connect the socket */
+ if( connect( i_handle, (struct sockaddr *) &sock,
+ sizeof( sock ) ) == (-1) )
+ {
+ intf_ErrMsg( "ipv6 error: cannot connect socket (%s)",
+ strerror(errno) );
+ close( i_handle );
+ return( -1 );
+ }
+
+ p_socket->i_handle = i_handle;
+ p_socket->i_mtu = 0; /* There is no MTU notion in TCP */
+
+ return( 0 );
+}
+
+/*****************************************************************************
+ * NetworkOpen: wrapper around OpenUDP and OpenTCP
+ *****************************************************************************/
+static int NetworkOpen( network_socket_t * p_socket )
+{
+ if( p_socket->i_type == NETWORK_UDP )
+ {
+ return OpenUDP( p_socket );
+ }
+ else
+ {
+ return OpenTCP( p_socket );
+ }
+}
+
+
* mpeg_system.c: TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: mpeg_system.c,v 1.81 2002/03/01 00:33:18 massiot Exp $
+ * $Id: mpeg_system.c,v 1.82 2002/03/04 23:56:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
+/*****************************************************************************
+ * input_ReadPS: store a PS packet into a data_buffer_t
+ *****************************************************************************/
+#define PEEK( SIZE ) \
+ i_error = input_Peek( p_input, &p_peek, SIZE ); \
+ if( i_error == -1 ) \
+ { \
+ return( -1 ); \
+ } \
+ else if( i_error < SIZE ) \
+ { \
+ /* EOF */ \
+ return( 0 ); \
+ }
+
+ssize_t input_ReadPS( input_thread_t * p_input, data_packet_t ** pp_data )
+{
+ byte_t * p_peek;
+ size_t i_packet_size;
+ ssize_t i_error, i_read;
+
+ /* Read what we believe to be a packet header. */
+ PEEK( 4 );
+
+ if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
+ {
+ if( *p_peek || *(p_peek + 1) || *(p_peek + 2) )
+ {
+ /* It is common for MPEG-1 streams to pad with zeros
+ * (although it is forbidden by the recommendation), so
+ * don't bother everybody in this case. */
+ intf_WarnMsg( 3, "input warning: garbage at input (0x%x%x%x%x)",
+ *p_peek, *(p_peek + 1), *(p_peek + 2), *(p_peek + 3) );
+ }
+
+ /* This is not the startcode of a packet. Read the stream
+ * until we find one. */
+ while( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
+ {
+ p_input->p_current_data++;
+ PEEK( 4 );
+ }
+ /* Packet found. */
+ }
+
+ /* 0x1B9 == SYSTEM_END_CODE, it is only 4 bytes long. */
+ if( p_peek[3] != 0xB9 )
+ {
+ /* The packet is at least 6 bytes long. */
+ PEEK( 6 );
+
+ if( p_peek[3] != 0xBA )
+ {
+ /* That's the case for all packets, except pack header. */
+ i_packet_size = (p_peek[4] << 8) | p_peek[5];
+ }
+ else
+ {
+ /* Pack header. */
+ if( (p_peek[4] & 0xC0) == 0x40 )
+ {
+ /* MPEG-2 */
+ i_packet_size = 8;
+ }
+ else if( (p_peek[4] & 0xF0) == 0x20 )
+ {
+ /* MPEG-1 */
+ i_packet_size = 6;
+ }
+ else
+ {
+ intf_ErrMsg( "Unable to determine stream type" );
+ return( -1 );
+ }
+ }
+ }
+ else
+ {
+ /* System End Code */
+ i_packet_size = -2;
+ }
+
+ /* Fetch a packet of the appropriate size. */
+ i_read = input_SplitBuffer( p_input, pp_data, i_packet_size + 6 );
+ if( i_read <= 0 )
+ {
+ return( i_read );
+ }
+
+ /* In MPEG-2 pack headers we still have to read stuffing bytes. */
+ if( ((*pp_data)->p_demux_start[3] == 0xBA) && (i_packet_size == 8) )
+ {
+ size_t i_stuffing = ((*pp_data)->p_demux_start[13] & 0x7);
+ /* Force refill of the input buffer - though we don't care
+ * about p_peek. Please note that this is unoptimized. */
+ PEEK( i_stuffing );
+ p_input->p_current_data += i_stuffing;
+ }
+
+ return( 1 );
+}
+
+#undef PEEK
+
/*****************************************************************************
* input_ParsePS: read the PS header
*****************************************************************************/
* TS Demultiplexing
*/
+/*****************************************************************************
+ * input_ReadTS: store a TS packet into a data_buffer_t
+ *****************************************************************************/
+#define PEEK( SIZE ) \
+ i_error = input_Peek( p_input, &p_peek, SIZE ); \
+ if( i_error == -1 ) \
+ { \
+ return( -1 ); \
+ } \
+ else if( i_error < SIZE ) \
+ { \
+ /* EOF */ \
+ return( 0 ); \
+ }
+
+ssize_t input_ReadTS( input_thread_t * p_input, data_packet_t ** pp_data )
+{
+ byte_t * p_peek;
+ ssize_t i_error, i_read;
+
+ PEEK( 1 );
+
+ if( *p_peek != TS_SYNC_CODE )
+ {
+ intf_WarnMsg( 3, "input warning: garbage at input (%x)", *p_peek );
+
+ if( p_input->i_mtu )
+ {
+ while( *p_peek != TS_SYNC_CODE )
+ {
+ /* Try to resync on next packet. */
+ PEEK( TS_PACKET_SIZE );
+ p_input->p_current_data += TS_PACKET_SIZE;
+ PEEK( 1 );
+ }
+ }
+ else
+ {
+ /* Move forward until we find 0x47 (and hope it's the good
+ * one... FIXME) */
+ while( *p_peek != TS_SYNC_CODE )
+ {
+ p_input->p_current_data++;
+ PEEK( 1 );
+ }
+ }
+ }
+
+ i_read = input_SplitBuffer( p_input, pp_data, TS_PACKET_SIZE );
+ if( i_read <= 0 )
+ {
+ return( i_read );
+ }
+
+ return( 1 );
+}
+
/*****************************************************************************
* input_DemuxTS: first step of demultiplexing: the TS header
*****************************************************************************/
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.159 2002/03/04 22:18:25 gbazin Exp $
+ * $Id: main.c,v 1.160 2002/03/04 23:56:38 massiot Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
ADD_STRING ( INPUT_DVD_DEVICE_VAR, "/dev/dvd", NULL, "DVD device", NULL )
ADD_STRING ( INPUT_VCD_DEVICE_VAR, "/dev/cdrom", NULL, "VCD device", NULL )
+ADD_BOOL ( INPUT_IPV6_VAR, NULL, "force IPv6", NULL )
+ADD_BOOL ( INPUT_IPV4_VAR, NULL, "force IPv4", NULL )
/* Decoder options */
ADD_CATEGORY_HINT( "Decoders Options", NULL )
* modules_plugin.h : Plugin management functions used by the core application.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules_plugin.h,v 1.13 2002/03/01 00:33:18 massiot Exp $
+ * $Id: modules_plugin.h,v 1.14 2002/03/04 23:56:38 massiot Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
(p_symbols)->input_ParsePES = input_ParsePES; \
(p_symbols)->input_GatherPES = input_GatherPES; \
(p_symbols)->input_DecodePES = input_DecodePES; \
+ (p_symbols)->input_ReadPS = input_ReadPS; \
(p_symbols)->input_ParsePS = input_ParsePS; \
(p_symbols)->input_DemuxPS = input_DemuxPS; \
+ (p_symbols)->input_ReadTS = input_ReadTS; \
(p_symbols)->input_DemuxTS = input_DemuxTS; \
(p_symbols)->input_DemuxPSI = input_DemuxPSI; \
(p_symbols)->input_ClockManageControl = input_ClockManageControl; \
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.58 2002/02/27 04:49:55 sam Exp $
+ * $Id: netutils.c,v 1.59 2002/03/04 23:56:38 massiot Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
#include <videolan/vlc.h>
-#ifdef STRNCASECMP_IN_STRINGS_H
-# include <strings.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* gethostname() */
#elif defined( _MSC_VER ) && defined( _WIN32 )
#include "netutils.h"
#include "intf_playlist.h"
+#include "network.h"
/*****************************************************************************
* input_channel_t: channel library data
static int GetAdapterInfo ( int i_adapter, char *psz_string );
#endif
-/*****************************************************************************
- * network_BuildAddr : fill a sockaddr_in structure
- *****************************************************************************/
-int network_BuildAddr( struct sockaddr_in * p_socket,
- char * psz_address, int i_port )
-{
-#if 0
- intf_ErrMsg( "error: networking is not yet supported under BeOS" );
- return( 1 );
-
-#else
- /* Reset struct */
- memset( p_socket, 0, sizeof( struct sockaddr_in ) );
- p_socket->sin_family = AF_INET; /* family */
- p_socket->sin_port = htons( i_port );
- if( psz_address == NULL )
- {
- p_socket->sin_addr.s_addr = INADDR_ANY;
- }
- else
- {
- struct hostent * p_hostent;
-
- /* Try to convert address directly from in_addr - this will work if
- * psz_broadcast is dotted decimal. */
-#ifdef HAVE_ARPA_INET_H
- if( !inet_aton( psz_address, &p_socket->sin_addr) )
-#else
- if( (p_socket->sin_addr.s_addr = inet_addr( psz_address )) == -1 )
-#endif
- {
- /* We have a fqdn, try to find its address */
- if ( (p_hostent = gethostbyname( psz_address )) == NULL )
- {
- intf_ErrMsg( "BuildLocalAddr: unknown host %s", psz_address );
- return( -1 );
- }
-
- /* Copy the first address of the host in the socket address */
- memcpy( &p_socket->sin_addr, p_hostent->h_addr_list[0],
- p_hostent->h_length );
- }
- }
- return( 0 );
-#endif
-}
-
/*****************************************************************************
* network_ChannelCreate: initialize global channel method data
*****************************************************************************
*****************************************************************************/
int network_ChannelCreate( void )
{
-#if defined( SYS_LINUX ) || defined( WIN32 )
+#if !defined( SYS_LINUX ) && !defined( WIN32 )
+ intf_ErrMsg( "channel warning: VLAN-based channels are not supported"
+ " under this architecture" );
+#endif
/* Allocate structure */
p_main->p_channel = malloc( sizeof( input_channel_t ) );
intf_WarnMsg( 2, "network: channels initialized" );
return( 0 );
-
-#else
- intf_ErrMsg( "network error : channels not supported on this platform" );
- return( 1 );
-
-#endif
}
/*****************************************************************************
*****************************************************************************/
int network_ChannelJoin( int i_channel )
{
-#if defined( SYS_LINUX ) || defined( WIN32 )
-
#define VLCS_VERSION 13
#define MESSAGE_LENGTH 256
+ struct module_s * p_network;
+ char * psz_network = NULL;
+ network_socket_t socket_desc;
char psz_mess[ MESSAGE_LENGTH ];
char psz_mac[ 40 ];
- int i_fd, i_dummy, i_port;
+ int i_fd, i_port;
char *psz_vlcs;
- struct sockaddr_in sa_server;
- struct sockaddr_in sa_client;
struct timeval delay;
fd_set fds;
{
intf_WarnMsg( 2, "network: waiting before changing channel" );
/* XXX Isn't this completely brain-damaged ??? -- Sam */
+ /* Yes it is. I don't think this is still justified with the new
+ * vlanserver --Meuuh */
mwait( p_main->p_channel->last_change + INPUT_CHANNEL_CHANGE_DELAY );
}
- /* Initializing the socket */
- i_fd = socket( AF_INET, SOCK_DGRAM, 0 );
- if( i_fd < 0 )
+ if( config_GetIntVariable( INPUT_IPV4_VAR ) )
{
- intf_ErrMsg( "network error: unable to create vlcs socket (%s)",
- strerror( errno ) );
- return -1;
+ psz_network = "ipv4";
}
-
- i_dummy = 1;
- if( setsockopt( i_fd, SOL_SOCKET, SO_REUSEADDR,
- (void *) &i_dummy, sizeof( i_dummy ) ) == -1 )
+ if( config_GetIntVariable( INPUT_IPV6_VAR ) )
{
- intf_ErrMsg( "network error: can't SO_REUSEADDR vlcs socket (%s)",
- strerror(errno));
- close( i_fd );
- return -1;
+ psz_network = "ipv6";
}
/* Getting information about the channel server */
i_port = config_GetIntVariable( INPUT_CHANNEL_PORT_VAR );
- intf_WarnMsg( 5, "network: socket %i, vlcs '%s', port %d",
- i_fd, psz_vlcs, i_port );
-
- memset( &sa_client, 0x00, sizeof(struct sockaddr_in) );
- memset( &sa_server, 0x00, sizeof(struct sockaddr_in) );
- sa_client.sin_family = AF_INET;
- sa_server.sin_family = AF_INET;
- sa_client.sin_port = htons( 4312 );
- sa_server.sin_port = htons( i_port );
- sa_client.sin_addr.s_addr = INADDR_ANY;
-#ifdef HAVE_ARPA_INET_H
- inet_aton( psz_vlcs, &sa_server.sin_addr );
-#else
- sa_server.sin_addr.s_addr = inet_addr( psz_vlcs );
-#endif
- free( psz_vlcs );
+ intf_WarnMsg( 5, "channel: connecting to %s:%d",
+ psz_vlcs, i_port );
- /* Bind the socket */
- if( bind( i_fd, (struct sockaddr*)(&sa_client), sizeof(sa_client) ) )
+ /* Prepare the network_socket_t structure */
+ socket_desc.i_type = NETWORK_UDP;
+ socket_desc.psz_bind_addr = NULL;
+ socket_desc.i_bind_port = 4321;
+ socket_desc.psz_server_addr = psz_vlcs;
+ socket_desc.i_server_port = i_port;
+
+ /* Find an appropriate network module */
+ p_network = module_Need( MODULE_CAPABILITY_NETWORK, psz_network,
+ &socket_desc );
+ if( p_network == NULL )
{
- intf_ErrMsg( "network: unable to bind vlcs socket (%s)",
- strerror( errno ) );
- close( i_fd );
- return -1;
+ return( -1 );
}
+ module_Unneed( p_network );
+
+ free( psz_vlcs ); /* Do we really need this ? -- Meuuh */
+ i_fd = socket_desc.i_handle;
/* Look for the interface MAC address */
if( GetMacAddress( i_fd, psz_mac ) )
psz_mac );
/* Send the message */
- sendto( i_fd, psz_mess, MESSAGE_LENGTH, 0,
- (struct sockaddr *)(&sa_server), sizeof(struct sockaddr) );
+ send( i_fd, psz_mess, MESSAGE_LENGTH, 0 );
intf_WarnMsg( 2, "network: attempting to join channel %d", i_channel );
break;
}
- i_dummy = sizeof( struct sockaddr );
- recvfrom( i_fd, psz_mess, MESSAGE_LENGTH, 0,
- (struct sockaddr *)(&sa_client), &i_dummy);
- psz_mess[ MESSAGE_LENGTH - 1 ] = 0;
+ recv( i_fd, psz_mess, MESSAGE_LENGTH, 0 );
+ psz_mess[ MESSAGE_LENGTH - 1 ] = '\0';
if( !strncasecmp( psz_mess, "E: ", 3 ) )
{
close( i_fd );
return 0;
-
-#else
- intf_ErrMsg( "network error: channels not supported on this platform" );
- return -1;
-
-#endif
}
/* Following functions are local */
return( i_ret );
#else
- return( -1);
+ strcpy( psz_mac, "00:00:00:00:00:00" );
+ return( 0 );
#endif
}
projects / vlc / commitdiff