Use 1400 rather than 1500 as default *application-layer* MTU to be on the

safe side

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 63e37314b147a1fe8b2a352de221f048b8476d81..813e7679bc74f49739cd485691f8fc4086eed248 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -141,7 +141,7 @@ vlc_module_begin();
     add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE );
     add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE );
     add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE );
-    add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT,
+    add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
                  MTUOUT_LONGTEXT, VLC_TRUE );
     add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE );
     add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE );

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index efef30a8908585d738465d9752d03bad02752d46..9e964073381d1b464d99ded656f8d6c02633dc86 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -475,8 +475,10 @@ static const char *ppsz_clock_descriptions[] =
 
 #define MTU_TEXT N_("MTU of the network interface")
 #define MTU_LONGTEXT N_( \
-    "This is the maximum packet size that can be transmitted " \
-    "over the network interface. On Ethernet it is usually 1500 bytes.")
+    "This is the maximum application-layer packet size that can be " \
+    "transmitted over the network (in bytes).")
+/* Should be less than 1500 - 8[ppp] - 40[ip6] - 8[udp] in any case. */
+#define MTU_DEFAULT 1400
 
 #define TTL_TEXT N_("Hop limit (TTL)")
 #define TTL_LONGTEXT N_( \
@@ -1535,7 +1537,7 @@ vlc_module_begin();
 
     add_integer( "server-port", 1234, NULL,
                  SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
-    add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
+    add_integer( "mtu", MTU_DEFAULT, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
     add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE );
         change_short('6');
     add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE );