Attachment #176393 for bug #252548




			magic = (guint32 *)gf_buddy->gameip;
			if ((NULL != gf_buddy->gameip) && (0 != *magic)) {
				
				g_sprintf(ipstr, "%u.%u.%u.%u", gf_buddy->gameip[3], gf_buddy->gameip[2],
						gf_buddy->gameip[1], gf_buddy->gameip[0]);

					gchar * value = g_strdup_printf("%s:%u", ipstr, gf_buddy->gameport);
					purple_notify_user_info_add_pair(user_info,"Server",value);
					g_free(value);


	gfire_data *gfire = (gfire_data *)gc->proto_data;
	gfire->buddies = NULL;

	purple_debug(PURPLE_DEBUG_MISC, "gfire", "connected source=%u\n",source);
	if (!g_list_find(purple_connections_get_all(), gc)) {
		close(source);
		return;

	gerr = 0;
 	worked=sworked=g_shell_parse_argv(command, &argcp, &argvp, &gerr);
 	if (worked) {
		purple_debug(PURPLE_DEBUG_MISC, "gfire", "Attempting to join game %u, on server %u.%u.%u.%u , at port %u\n",
				game, NNA(sip, sip[3]), NNA(sip, sip[2]), NNA(sip, sip[1]), NNA(sip, sip[0]), sport);
 		purple_debug(PURPLE_DEBUG_MISC, "gfire", "launch xml command parsed to:\n");
 		purple_debug(PURPLE_DEBUG_MISC, "gfire", "%s\n", NN(command));

 			if (len) gfire_send(gc, gfire->buff_out, len);
			g_free(ipbin);
 			gfire->gameid = game;
 			purple_debug(PURPLE_DEBUG_MISC, "gfire", "(XQF cb): Detected game join (%u) at (%s:%u)\n", game,
						NN(xqfs->ip), xqfs->port );
 			gfire_xqf_linfo_free(xqfs);
 		} else {

Lines 31-34 Link Here

(-)gfire-0.7.1/src/gf_debug.orig.h (-1 / +1 lines)
31	/* define for a binary string, so we never pass a bin array element or	31	/* define for a binary string, so we never pass a bin array element or
32	* deference a null binary string to gaim_debug	32	* deference a null binary string to gaim_debug
33	*/	33	*/
34	#define NNA(ba, bai) (ba ? bai : 0x00)	34	#define NNA(ba, bai) (ba ? bai & 0x00FF : 0x00)

Return to bug 252548

Lines 162-171 Link Here

(-)gfire-0.7.1/src/gfire.orig.c (-5 / +5 lines)
162	magic = (guint32 *)gf_buddy->gameip;	162	magic = (guint32 *)gf_buddy->gameip;
163	if ((NULL != gf_buddy->gameip) && (0 != *magic)) {	163	if ((NULL != gf_buddy->gameip) && (0 != *magic)) {
164		164
165	g_sprintf(ipstr, "%d.%d.%d.%d", gf_buddy->gameip[3], gf_buddy->gameip[2],	165	g_sprintf(ipstr, "%u.%u.%u.%u", gf_buddy->gameip[3], gf_buddy->gameip[2],
166	gf_buddy->gameip[1], gf_buddy->gameip[0]);	166	gf_buddy->gameip[1], gf_buddy->gameip[0]);
167		167
168	gchar * value = g_strdup_printf("%s:%d", ipstr, gf_buddy->gameport);	168	gchar * value = g_strdup_printf("%s:%u", ipstr, gf_buddy->gameport);
169	purple_notify_user_info_add_pair(user_info,"Server",value);	169	purple_notify_user_info_add_pair(user_info,"Server",value);
170	g_free(value);	170	g_free(value);
171		171
Lines 248-254 Link Here
248	gfire_data gfire = (gfire_data )gc->proto_data;	248	gfire_data gfire = (gfire_data )gc->proto_data;
249	gfire->buddies = NULL;	249	gfire->buddies = NULL;
250		250
251	purple_debug(PURPLE_DEBUG_MISC, "gfire", "connected source=%d\n",source);	251	purple_debug(PURPLE_DEBUG_MISC, "gfire", "connected source=%u\n",source);
252	if (!g_list_find(purple_connections_get_all(), gc)) {	252	if (!g_list_find(purple_connections_get_all(), gc)) {
253	close(source);	253	close(source);
254	return;	254	return;
Lines 1100-1106 Link Here
1100	gerr = 0;	1100	gerr = 0;
1101	worked=sworked=g_shell_parse_argv(command, &argcp, &argvp, &gerr);	1101	worked=sworked=g_shell_parse_argv(command, &argcp, &argvp, &gerr);
1102	if (worked) {	1102	if (worked) {
1103	purple_debug(PURPLE_DEBUG_MISC, "gfire", "Attempting to join game %d, on server %d.%d.%d.%d , at port %d\n",	1103	purple_debug(PURPLE_DEBUG_MISC, "gfire", "Attempting to join game %u, on server %u.%u.%u.%u , at port %u\n",
1104	game, NNA(sip, sip[3]), NNA(sip, sip[2]), NNA(sip, sip[1]), NNA(sip, sip[0]), sport);	1104	game, NNA(sip, sip[3]), NNA(sip, sip[2]), NNA(sip, sip[1]), NNA(sip, sip[0]), sport);
1105	purple_debug(PURPLE_DEBUG_MISC, "gfire", "launch xml command parsed to:\n");	1105	purple_debug(PURPLE_DEBUG_MISC, "gfire", "launch xml command parsed to:\n");
1106	purple_debug(PURPLE_DEBUG_MISC, "gfire", "%s\n", NN(command));	1106	purple_debug(PURPLE_DEBUG_MISC, "gfire", "%s\n", NN(command));
Lines 1221-1227 Link Here
1221	if (len) gfire_send(gc, gfire->buff_out, len);	1221	if (len) gfire_send(gc, gfire->buff_out, len);
1222	g_free(ipbin);	1222	g_free(ipbin);
1223	gfire->gameid = game;	1223	gfire->gameid = game;
1224	purple_debug(PURPLE_DEBUG_MISC, "gfire", "(XQF cb): Detected game join (%d) at (%s:%d)\n", game,	1224	purple_debug(PURPLE_DEBUG_MISC, "gfire", "(XQF cb): Detected game join (%u) at (%s:%u)\n", game,
1225	NN(xqfs->ip), xqfs->port );	1225	NN(xqfs->ip), xqfs->port );
1226	gfire_xqf_linfo_free(xqfs);	1226	gfire_xqf_linfo_free(xqfs);
1227	} else {	1227	} else {