Index: squid/src/wccp.c
diff -c squid/src/wccp.c:1.19.2.8 squid/src/wccp.c:1.19.2.9
*** squid/src/wccp.c:1.19.2.8	Tue Feb 1 08:21:42 2005
--- squid/src/wccp.c	Fri Feb 4 04:38:15 2005
***************
*** 82,88 ****
 static int theOutWccpConnection = -1;
 static struct wccp_here_i_am_t wccp_here_i_am;
 static struct wccp_i_see_you_t wccp_i_see_you;
! static int change;
 static int last_assign_buckets_change;
 static int number_caches;
 static struct in_addr local_ip;
--- 82,89 ----
 static int theOutWccpConnection = -1;
 static struct wccp_here_i_am_t wccp_here_i_am;
 static struct wccp_i_see_you_t wccp_i_see_you;
! static int last_change;
! static int last_id;
 static int last_assign_buckets_change;
 static int number_caches;
 static struct in_addr local_ip;
***************
*** 108,115 ****
 wccp_here_i_am.type = htonl(WCCP_HERE_I_AM);
 wccp_here_i_am.version = htonl(Config.Wccp.version);
 wccp_here_i_am.revision = htonl(WCCP_REVISION);
! change = 0;
 last_assign_buckets_change = 0;
 if (Config.Wccp.router.s_addr != any_addr.s_addr)
 	if (!eventFind(wccpHereIam, NULL))
 	 eventAdd("wccpHereIam", wccpHereIam, NULL, 5.0, 1);
--- 109,118 ----
 wccp_here_i_am.type = htonl(WCCP_HERE_I_AM);
 wccp_here_i_am.version = htonl(Config.Wccp.version);
 wccp_here_i_am.revision = htonl(WCCP_REVISION);
! last_change = 0;
! last_id = 0;
 last_assign_buckets_change = 0;
+ number_caches = 0;
 if (Config.Wccp.router.s_addr != any_addr.s_addr)
 	if (!eventFind(wccpHereIam, NULL))
 	 eventAdd("wccpHereIam", wccpHereIam, NULL, 5.0, 1);
***************
*** 244,260 ****
 	return;
 if (ntohl(wccp_i_see_you.type) != WCCP_I_SEE_YOU)
 	return;
! if (ntohl(wccp_i_see_you.number)> WCCP_ACTIVE_CACHES) {
 	debug(80, 1) ("Ignoring WCCP_I_SEE_YOU from %s with number of caches set to %d\n",
 	 inet_ntoa(from.sin_addr), (int) ntohl(wccp_i_see_you.number));
 	return;
 }
! if (ntohl(wccp_i_see_you.number) <= 0) { ! debug(80, 1) ("Ignoring WCCP_I_SEE_YOU from %s with non-positive number of caches\n", ! inet_ntoa(from.sin_addr)); ! return; ! } ! if ((0 == change) && (number_caches == ntohl(wccp_i_see_you.number))) { if (last_assign_buckets_change == wccp_i_see_you.change) { /* * After a WCCP_ASSIGN_BUCKET message, the router should --- 247,259 ---- return; if (ntohl(wccp_i_see_you.type) != WCCP_I_SEE_YOU) return; ! if (ntohl(wccp_i_see_you.number)> WCCP_ACTIVE_CACHES &#124;&#124; ntohl(wccp_i_see_you.number) < 0) {
 	debug(80, 1) ("Ignoring WCCP_I_SEE_YOU from %s with number of caches set to %d\n",
 	 inet_ntoa(from.sin_addr), (int) ntohl(wccp_i_see_you.number));
 	return;
 }
! last_id = wccp_i_see_you.id;
! if ((0 == last_change) && (number_caches == ntohl(wccp_i_see_you.number))) {
 	if (last_assign_buckets_change == wccp_i_see_you.change) {
 	 /*
 	 * After a WCCP_ASSIGN_BUCKET message, the router should
***************
*** 266,279 ****
 	 */
 	 (void) 0;
 	} else {
! 	 change = wccp_i_see_you.change;
 	 return;
 	}
 }
! if (change != wccp_i_see_you.change) {
! 	change = wccp_i_see_you.change;
 	if (wccpLowestIP() && wccp_i_see_you.number) {
! 	 last_assign_buckets_change = change;
 	 wccpAssignBuckets();
 	}
 }
--- 265,278 ----
 	 */
 	 (void) 0;
 	} else {
! 	 last_change = wccp_i_see_you.change;
 	 return;
 	}
 }
! if (last_change != wccp_i_see_you.change) {
! 	last_change = wccp_i_see_you.change;
 	if (wccpLowestIP() && wccp_i_see_you.number) {
! 	 last_assign_buckets_change = last_change;
 	 wccpAssignBuckets();
 	}
 }
***************
*** 283,288 ****
--- 282,288 ----
 wccpLowestIP(void)
 {
 int loop;
+ int found = 0;
 /*
 * We sanity checked wccp_i_see_you.number back in wccpHandleUdp()
 */
***************
*** 290,297 ****
 	assert(loop < WCCP_ACTIVE_CACHES);
 	if (wccp_i_see_you.wccp_cache_entry[loop].ip_addr.s_addr < local_ip.s_addr)
 	 return 0;
 }
! return 1;
 }
 
 static void
--- 290,299 ----
 	assert(loop < WCCP_ACTIVE_CACHES);
 	if (wccp_i_see_you.wccp_cache_entry[loop].ip_addr.s_addr < local_ip.s_addr)
 	 return 0;
+ 	if (wccp_i_see_you.wccp_cache_entry[loop].ip_addr.s_addr == local_ip.s_addr)
+ 	 found = 1;
 }
! return found;
 }
 
 static void
***************
*** 299,305 ****
 {
 debug(80, 6) ("wccpHereIam: Called\n");
 
! wccp_here_i_am.id = wccp_i_see_you.id;
 send(theOutWccpConnection,
 	&wccp_here_i_am,
 	sizeof(wccp_here_i_am),
--- 301,307 ----
 {
 debug(80, 6) ("wccpHereIam: Called\n");
 
! wccp_here_i_am.id = last_id;
 send(theOutWccpConnection,
 	&wccp_here_i_am,
 	sizeof(wccp_here_i_am),
***************
*** 361,367 ****
 	buf,
 	wab_len + WCCP_BUCKETS + cache_len,
 	0);
! change = 0;
 xfree(buf);
 }
 
--- 363,369 ----
 	buf,
 	wab_len + WCCP_BUCKETS + cache_len,
 	0);
! last_change = 0;
 xfree(buf);
 }
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-wccp_disturb.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-wccp_disturb.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>