Mercurial > pidgin
comparison libpurple/media/backend-fs2.c @ 31688:80b51b8460af
applied changes from 32a55bbc4f1e8d632d205d040fa3e814559e1c95
through 4beb86df935d5dfd7ce4107bcabe1944e59a63a2
Original commit message:
Actually set the relay info for TCP
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 20 Jun 2011 05:30:52 +0000 |
| parents | 8b434ffd4efc |
| children | 88587257d083 |
comparison
equal
deleted
inserted
replaced
| 31687:6d6b4f2a5e69 | 31688:80b51b8460af |
|---|---|
| 1821 | 1821 |
| 1822 /* TCP */ | 1822 /* TCP */ |
| 1823 port = purple_prefs_get_int("/purple/network/turn_port_tcp"); | 1823 port = purple_prefs_get_int("/purple/network/turn_port_tcp"); |
| 1824 if (port > 0) { | 1824 if (port > 0) { |
| 1825 relay_info = append_relay_info(relay_info, turn_ip, port, username, | 1825 relay_info = append_relay_info(relay_info, turn_ip, port, username, |
| 1826 password, "udp"); | 1826 password, "tcp"); |
| 1827 } | 1827 } |
| 1828 | 1828 |
| 1829 /* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode | 1829 /* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode |
| 1830 at this time */ | 1830 at this time */ |
| 1831 | 1831 |