Mercurial > pidgin.yaz
diff src/protocols/simple/simple.c @ 13129:d0ae6489a0fb
[gaim-migrate @ 15491]
Remove some sillyness when attempting to autodetect our IP address
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 06 Feb 2006 04:20:30 +0000 |
| parents | edef744647ff |
| children | 891be2f09b5c |
line wrap: on
line diff
--- a/src/protocols/simple/simple.c Sun Feb 05 22:31:48 2006 +0000 +++ b/src/protocols/simple/simple.c Mon Feb 06 04:20:30 2006 +0000 @@ -61,17 +61,6 @@ rand() & 0xFFFF, rand() & 0xFFFF); } -static char *get_my_ip() { - static char my_ip[42]; - const char *tmp = gaim_network_get_public_ip(); - - if(!tmp || !strcmp(tmp,"0.0.0.0")) { - tmp = gaim_network_get_my_ip(-1); - } - strcpy(my_ip, tmp ? tmp : "0.0.0.0"); - return my_ip; -} - static const char *simple_list_icon(GaimAccount *a, GaimBuddy *b) { return "simple"; } @@ -590,7 +579,7 @@ method, url, sip->udp ? "UDP" : "TCP", - get_my_ip(), + gaim_network_get_my_ip(-1), sip->listenport, branch, sip->username, @@ -621,7 +610,7 @@ static void do_register_exp(struct simple_account_data *sip, int expire) { char *uri = g_strdup_printf("sip:%s",sip->servername); char *to = g_strdup_printf("sip:%s@%s",sip->username,sip->servername); - char *contact = g_strdup_printf("Contact: <sip:%s@%s:%d;transport=%s>;methods=\"MESSAGE, SUBSCRIBE, NOTIFY\"\r\nExpires: %d\r\n", sip->username, get_my_ip(), sip->listenport, sip->udp ? "udp" : "tcp", expire); + char *contact = g_strdup_printf("Contact: <sip:%s@%s:%d;transport=%s>;methods=\"MESSAGE, SUBSCRIBE, NOTIFY\"\r\nExpires: %d\r\n", sip->username, gaim_network_get_my_ip(-1), sip->listenport, sip->udp ? "udp" : "tcp", expire); sip->registerstatus = 1;