[MPlayer-dev-eng] [PATCH] ipv6 TCP support

[Dave Lambley]

Hi,

I have a patch that modifies network.c to support ipv6 connections.
connect2Server() has been modified to add an address family argument and
is renamed to connect2Server_with_af.

A wrapper function, connect2Server() has been added. It tries to connect
with IPv6 first, then IPv4. If both fail it returns the least worst
error code.

I've also added a function af2String(), to look up what address family
numbers really are, for printing status messages.

It doesn't change http proxying behaviour, so unless your proxy supports
IPv6, you'll want to turn it off.

There's not a lot round ATM to test it with. I've only tested it with
http. There was an mms server at

mms://media6.v6testbed.net/bbc1 

which used to work with a version of mplayer I hacked, but doesn't seem
to any more. I don't have a copy of Windows with IPv6 to try it with.

You can't give at an IPv6 address, only a name, as part of a URL. The
URL code will get confused by all the colons. I don't know if there is a
way round this, unless you assume there aren't port numbers in the URL.

IPv4's is fine if you were wondering.

It should work on machines without IPv6, so long as they have the header
files. I haven't made it provide wrapper code and #defines for those
without, but I'm a bit scared of configure! I've tested the code on
FreeBSD and Linux x86.

Cheers,
Dave

-------------- next part --------------
PyBmZm1wZWcKSW5kZXg6IGxpYm1wZGVtdXgvbmV0d29yay5jCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT
IGZpbGU6IC9jdnNyb290L21wbGF5ZXIvbWFpbi9saWJtcGRlbXV4L25ldHdvcmsuYyx2CnJl
dHJpZXZpbmcgcmV2aXNpb24gMS43MQpkaWZmIC11IC1yMS43MSBuZXR3b3JrLmMKLS0tIGxp
Ym1wZGVtdXgvbmV0d29yay5jCTEzIEphbiAyMDAzIDAzOjEwOjE5IC0wMDAwCTEuNzEKKysr
IGxpYm1wZGVtdXgvbmV0d29yay5jCTI0IE1hciAyMDAzIDEwOjUzOjA2IC0wMDAwCkBAIC0x
NTEsNDkgKzE1MSw5MiBAQAogfQogI2VuZGlmCiAKLS8vIENvbm5lY3QgdG8gYSBzZXJ2ZXIg
dXNpbmcgYSBUQ1AgY29ubmVjdGlvbgorCisvLyBDb252ZXJ0cyBhbiBhZGRyZXNzIGZhbWls
eSBjb25zdGFudCB0byBhIHN0cmluZworCitjaGFyICphZjJTdHJpbmcoaW50IGFmKSB7CisJ
c3dpdGNoIChhZikgeworCQljYXNlIEFGX0lORVQ6CXJldHVybiAiQUZfSU5FVCI7CisJCWNh
c2UgQUZfSU5FVDY6CXJldHVybiAiQUZfSU5FVDYiOworCQlkZWZhdWx0OglyZXR1cm4gIlVu
a25vd24gYWRkcmVzcyBmYW1pbHkhIjsKKwl9Cit9CisKKworCisvLyBDb25uZWN0IHRvIGEg
c2VydmVyIHVzaW5nIGEgVENQIGNvbm5lY3Rpb24sIHdpdGggc3BlY2lmaWVkIGFkZHJlc3Mg
ZmFtaWx5CiAvLyByZXR1cm4gLTIgZm9yIGZhdGFsIGVycm9yLCBsaWtlIHVuYWJsZSB0byBy
ZXNvbHZlIG5hbWUsIGNvbm5lY3Rpb24gdGltZW91dC4uLgogLy8gcmV0dXJuIC0xIGlzIHVu
YWJsZSB0byBjb25uZWN0IHRvIGEgcGFydGljdWxhciBwb3J0CisKIGludAotY29ubmVjdDJT
ZXJ2ZXIoY2hhciAqaG9zdCwgaW50IHBvcnQpIHsKK2Nvbm5lY3QyU2VydmVyX3dpdGhfYWYo
Y2hhciAqaG9zdCwgaW50IHBvcnQsIGludCBhZikgewogCWludCBzb2NrZXRfc2VydmVyX2Zk
OwogCWludCBlcnIsIGVycl9sZW47CiAJaW50IHJldCxjb3VudCA9IDA7CiAJZmRfc2V0IHNl
dDsKIAlzdHJ1Y3QgdGltZXZhbCB0djsKLQlzdHJ1Y3Qgc29ja2FkZHJfaW4gc2VydmVyX2Fk
ZHJlc3M7CisJdW5pb24geyBzdHJ1Y3Qgc29ja2FkZHJfaW4gZm91cjsgc3RydWN0IHNvY2th
ZGRyX2luNiBzaXg7IH0gc2VydmVyX2FkZHJlc3M7CisJc2l6ZV90IHNlcnZlcl9hZGRyZXNz
X3NpemU7CisJdm9pZCAqb3VyX3NfYWRkcjsJLy8gUG9pbnRlciB0byBzaW5fYWRkciBvciBz
aW42X2FkZHIKIAlzdHJ1Y3QgaG9zdGVudCAqaHA9TlVMTDsKLQotCXNvY2tldF9zZXJ2ZXJf
ZmQgPSBzb2NrZXQoQUZfSU5FVCwgU09DS19TVFJFQU0sIDApOworCWNoYXIgYnVmWzI1NV07
CisJCisJc29ja2V0X3NlcnZlcl9mZCA9IHNvY2tldChhZiwgU09DS19TVFJFQU0sIDApOwor
CQorCQogCWlmKCBzb2NrZXRfc2VydmVyX2ZkPT0tMSApIHsKLQkJbXBfbXNnKE1TR1RfTkVU
V09SSyxNU0dMX0VSUiwiRmFpbGVkIHRvIGNyZWF0ZSBzb2NrZXRcbiIpOworCQltcF9tc2co
TVNHVF9ORVRXT1JLLE1TR0xfRVJSLCJGYWlsZWQgdG8gY3JlYXRlICVzIHNvY2tldDpcbiIs
IGFmMlN0cmluZyhhZikpOwogCQlyZXR1cm4gLTI7CiAJfQogCi0JaWYoIGlzYWxwaGEoaG9z
dFswXSkgKSB7Ci0JCW1wX21zZyhNU0dUX05FVFdPUkssTVNHTF9TVEFUVVMsIlJlc29sdmlu
ZyAlcyAuLi5cbiIsIGhvc3QgKTsKLQkJaHA9KHN0cnVjdCBob3N0ZW50KilnZXRob3N0Ynlu
YW1lKCBob3N0ICk7CisJc3dpdGNoIChhZikgeworCQljYXNlIEFGX0lORVQ6ICBvdXJfc19h
ZGRyID0gKHZvaWQgKikgJnNlcnZlcl9hZGRyZXNzLmZvdXIuc2luX2FkZHI7IGJyZWFrOwor
CQljYXNlIEFGX0lORVQ2OiBvdXJfc19hZGRyID0gKHZvaWQgKikgJnNlcnZlcl9hZGRyZXNz
LnNpeC5zaW42X2FkZHI7IGJyZWFrOworCQlkZWZhdWx0OgorCQkJbXBfbXNnKE1TR1RfTkVU
V09SSyxNU0dMX0VSUiwgIlVua25vd24gYWRkcmVzcyBmYW1pbHkgJWQ6XG4iLCBhZik7CisJ
CQlyZXR1cm4gLTI7CisJfQorCQorCQorCWJ6ZXJvKCZzZXJ2ZXJfYWRkcmVzcywgc2l6ZW9m
KHNlcnZlcl9hZGRyZXNzKSk7CisJCisJaWYgKGluZXRfcHRvbihhZiwgaG9zdCwgb3VyX3Nf
YWRkcikhPTEpIHsKKwkJbXBfbXNnKE1TR1RfTkVUV09SSyxNU0dMX1NUQVRVUywiUmVzb2x2
aW5nICVzIGZvciAlcy4uLlxuIiwgaG9zdCwgYWYyU3RyaW5nKGFmKSk7CisJCWhwPShzdHJ1
Y3QgaG9zdGVudCopZ2V0aG9zdGJ5bmFtZTIoIGhvc3QsIGFmICk7CiAJCWlmKCBocD09TlVM
TCApIHsKLQkJCW1wX21zZyhNU0dUX05FVFdPUkssTVNHTF9FUlIsIkNvdW5sZG4ndCByZXNv
bHZlIG5hbWU6ICVzXG4iLCBob3N0KTsKKwkJCW1wX21zZyhNU0dUX05FVFdPUkssTVNHTF9F
UlIsIkNvdWxkbid0IHJlc29sdmUgbmFtZSBmb3IgJXM6ICVzXG4iLCBhZjJTdHJpbmcoYWYp
LCBob3N0KTsKIAkJCXJldHVybiAtMjsKIAkJfQotCQltZW1jcHkoICh2b2lkKikmc2VydmVy
X2FkZHJlc3Muc2luX2FkZHIuc19hZGRyLCAodm9pZCopaHAtPmhfYWRkciwgaHAtPmhfbGVu
Z3RoICk7Ci0JfSBlbHNlIHsKLQkJaW5ldF9wdG9uKEFGX0lORVQsIGhvc3QsICZzZXJ2ZXJf
YWRkcmVzcy5zaW5fYWRkcik7CisJCQorCQltZW1jcHkoIG91cl9zX2FkZHIsICh2b2lkKilo
cC0+aF9hZGRyLCBocC0+aF9sZW5ndGggKTsKIAl9Ci0Jc2VydmVyX2FkZHJlc3Muc2luX2Zh
bWlseT1BRl9JTkVUOwotCXNlcnZlcl9hZGRyZXNzLnNpbl9wb3J0PWh0b25zKHBvcnQpOwog
CQotCS8vIFR1cm4gdGhlIHNvY2tldCBhcyBub24gYmxvY2tpbmcgc28gd2UgY2FuIHRpbWVv
dXQgb24gdGhlIGNvbm5lY3Rpb24KLQlpZiggaXNhbHBoYShob3N0WzBdKSAmJiBocCE9TlVM
TCApIHsKLQkJbXBfbXNnKE1TR1RfTkVUV09SSyxNU0dMX1NUQVRVUywiQ29ubmVjdGluZyB0
byBzZXJ2ZXIgJXNbJWQuJWQuJWQuJWRdOiVkIC4uLlxuIiwgaG9zdCwgKGhwLT5oX2FkZHJf
bGlzdFswXVswXSkmMHhmZiwgKGhwLT5oX2FkZHJfbGlzdFswXVsxXSkmMHhmZiwgKGhwLT5o
X2FkZHJfbGlzdFswXVsyXSkmMHhmZiwgKGhwLT5oX2FkZHJfbGlzdFswXVszXSkmMHhmZiwg
cG9ydCApOwotCX0gZWxzZSB7Ci0JCW1wX21zZyhNU0dUX05FVFdPUkssTVNHTF9TVEFUVVMs
IkNvbm5lY3RpbmcgdG8gc2VydmVyICVzOiVkIC4uLlxuIiwgaG9zdCwgcG9ydCApOworCXN3
aXRjaCAoYWYpIHsKKwkJY2FzZSBBRl9JTkVUOgorCQkJc2VydmVyX2FkZHJlc3MuZm91ci5z
aW5fZmFtaWx5PWFmOworCQkJc2VydmVyX2FkZHJlc3MuZm91ci5zaW5fcG9ydD1odG9ucyhw
b3J0KTsJCQkKKwkJCXNlcnZlcl9hZGRyZXNzX3NpemUgPSBzaXplb2Yoc2VydmVyX2FkZHJl
c3MuZm91cik7CisJCQlicmVhazsKKwkJCisJCWNhc2UgQUZfSU5FVDY6CisJCQlzZXJ2ZXJf
YWRkcmVzcy5zaXguc2luNl9mYW1pbHk9YWY7CisJCQlzZXJ2ZXJfYWRkcmVzcy5zaXguc2lu
Nl9wb3J0PWh0b25zKHBvcnQpOworCQkJc2VydmVyX2FkZHJlc3Nfc2l6ZSA9IHNpemVvZihz
ZXJ2ZXJfYWRkcmVzcy5zaXgpOworCQkJYnJlYWs7CisKKwkJZGVmYXVsdDoKKwkJCW1wX21z
ZyhNU0dUX05FVFdPUkssTVNHTF9FUlIsICJVbmtub3duIGFkZHJlc3MgZmFtaWx5ICVkOlxu
IiwgYWYpOworCQkJcmV0dXJuIC0yOwogCX0KKworCWluZXRfbnRvcChhZiwgb3VyX3NfYWRk
ciwgYnVmLCAyNTUpOwkJCQorCW1wX21zZyhNU0dUX05FVFdPUkssTVNHTF9TVEFUVVMsIkNv
bm5lY3RpbmcgdG8gc2VydmVyICVzWyVzXTolZCAuLi5cbiIsIGhvc3QsIGJ1ZiAsIHBvcnQg
KTsKKworCS8vIFR1cm4gdGhlIHNvY2tldCBhcyBub24gYmxvY2tpbmcgc28gd2UgY2FuIHRp
bWVvdXQgb24gdGhlIGNvbm5lY3Rpb24KIAlmY250bCggc29ja2V0X3NlcnZlcl9mZCwgRl9T
RVRGTCwgZmNudGwoc29ja2V0X3NlcnZlcl9mZCwgRl9HRVRGTCkgfCBPX05PTkJMT0NLICk7
Ci0JaWYoIGNvbm5lY3QoIHNvY2tldF9zZXJ2ZXJfZmQsIChzdHJ1Y3Qgc29ja2FkZHIqKSZz
ZXJ2ZXJfYWRkcmVzcywgc2l6ZW9mKHNlcnZlcl9hZGRyZXNzKSApPT0tMSApIHsKKwlpZigg
Y29ubmVjdCggc29ja2V0X3NlcnZlcl9mZCwgKHN0cnVjdCBzb2NrYWRkciopJnNlcnZlcl9h
ZGRyZXNzLCBzZXJ2ZXJfYWRkcmVzc19zaXplICk9PS0xICkgewogCQlpZiggZXJybm8hPUVJ
TlBST0dSRVNTICkgewotCQkJbXBfbXNnKE1TR1RfTkVUV09SSyxNU0dMX0VSUiwiRmFpbGVk
IHRvIGNvbm5lY3QgdG8gc2VydmVyXG4iKTsKKwkJCW1wX21zZyhNU0dUX05FVFdPUkssTVNH
TF9FUlIsIkZhaWxlZCB0byBjb25uZWN0IHRvIHNlcnZlciB3aXRoICVzXG4iLCBhZjJTdHJp
bmcoYWYpKTsKIAkJCWNsb3NlKHNvY2tldF9zZXJ2ZXJfZmQpOwogCQkJcmV0dXJuIC0xOwog
CQl9CkBAIC0yMzMsNyArMjc2LDI2IEBACiAJCW1wX21zZyhNU0dUX05FVFdPUkssTVNHTF9F
UlIsIkNvbm5lY3QgZXJyb3IgOiAlc1xuIixzdHJlcnJvcihlcnIpKTsKIAkJcmV0dXJuIC0x
OwogCX0KKwkKIAlyZXR1cm4gc29ja2V0X3NlcnZlcl9mZDsKK30KKworLy8gQ29ubmVjdCB0
byBhIHNlcnZlciB1c2luZyBhIFRDUCBjb25uZWN0aW9uCisvLyByZXR1cm4gLTIgZm9yIGZh
dGFsIGVycm9yLCBsaWtlIHVuYWJsZSB0byByZXNvbHZlIG5hbWUsIGNvbm5lY3Rpb24gdGlt
ZW91dC4uLgorLy8gcmV0dXJuIC0xIGlzIHVuYWJsZSB0byBjb25uZWN0IHRvIGEgcGFydGlj
dWxhciBwb3J0CisKKworaW50Citjb25uZWN0MlNlcnZlcihjaGFyICpob3N0LCBpbnQgIHBv
cnQpIHsKKwlpbnQgciwgczsKKwkKKwlyID0gY29ubmVjdDJTZXJ2ZXJfd2l0aF9hZihob3N0
LCBwb3J0LCBBRl9JTkVUNik7CQorCWlmIChyID4gLTEpIHJldHVybiByOworCQorCXMgPSBj
b25uZWN0MlNlcnZlcl93aXRoX2FmKGhvc3QsIHBvcnQsIEFGX0lORVQpOworCWlmIChzID09
IC0yKSByZXR1cm4gcjsKKwlyZXR1cm4gczsKKwkKIH0KIAogVVJMX3QqCg==