comparison src/protocols/simple/simple.c @ 12196:2f379ed0c26b

[gaim-migrate @ 14498] This patch from Thomas Butter fixes some Asterisk compatability issues with SIMPLE. Thanks to Cosimo Alfarano for finding this problem and testing the changes. committer: Tailor Script <[e-mail]>

12195:d040123d2b69

}

static void send_sip_request(GaimConnection *gc, gchar *method, gchar *url, gchar *to, gchar *addheaders, gchar *body, struct sip_dialog *dialog, TransCallback tc) {
	struct simple_account_data *sip = gc->proto_data;
	char *callid= dialog ? g_strdup(dialog->callid) : gencallid();
	char *auth="";
	char *addh="";
	gchar *branch = genbranch();
	char *buf;

		auth = g_strdup_printf("Proxy-Authorization: %s",buf);
		g_free(buf);
		gaim_debug(GAIM_DEBUG_MISC, "simple", "header %s", auth);
	}

	buf = g_strdup_printf("%s %s SIP/2.0\r\n"
			"Via: SIP/2.0/%s %s:%d;branch=%s\r\n"
			"From: <sip:%s@%s>;tag=%s\r\n"
			"To: <%s>%s%s\r\n"
			"Max-Forwards: 10\r\n"

12196:2f379ed0c26b

}

static void send_sip_request(GaimConnection *gc, gchar *method, gchar *url, gchar *to, gchar *addheaders, gchar *body, struct sip_dialog *dialog, TransCallback tc) {
	struct simple_account_data *sip = gc->proto_data;
	char *callid= dialog ? g_strdup(dialog->callid) : gencallid();
	if(!strcmp(method,"REGISTER")) {
		if(sip->regcallid) callid = g_strdup(sip->regcallid);
		else sip->regcallid = g_strdup(callid);
	}
	char *auth="";
	char *addh="";
	gchar *branch = genbranch();
	char *buf;

		auth = g_strdup_printf("Proxy-Authorization: %s",buf);
		g_free(buf);
		gaim_debug(GAIM_DEBUG_MISC, "simple", "header %s", auth);
	}

	if(!sip->ip || !strcmp(sip->ip,"0.0.0.0")) { // if there was no known ip retry now
		g_free(sip->ip);
		sip->ip = g_strdup(gaim_network_get_public_ip());
	}
	buf = g_strdup_printf("%s %s SIP/2.0\r\n"
			"Via: SIP/2.0/%s %s:%d;branch=%s\r\n"
			"From: <sip:%s@%s>;tag=%s\r\n"
			"To: <%s>%s%s\r\n"
			"Max-Forwards: 10\r\n"