*** main.c.STOCK	Wed Feb 20 18:51:44 2008
--- main.c	Thu Mar 19 21:14:40 2009
***************
*** 930,936 ****
  	     * cannot be trusted and address is different from one
  	     * that we recorded update it.
  	     */
! 	    if (spa->untrusted_addr == 0 && !(spa->addr[pidx] != NULL &&
  	      SA_LEN(ia[0]) == SA_LEN(spa->addr[pidx]) &&
  	      memcmp(ia[0], spa->addr[pidx], SA_LEN(ia[0])) == 0)) {
  		rtpp_log_write(RTPP_LOG_INFO, spa->log, "pre-filling %s's address "
--- 930,936 ----
  	     * cannot be trusted and address is different from one
  	     * that we recorded update it.
  	     */
! 	    if (spa->untrusted_addr[pidx] == 0 && !(spa->addr[pidx] != NULL &&
  	      SA_LEN(ia[0]) == SA_LEN(spa->addr[pidx]) &&
  	      memcmp(ia[0], spa->addr[pidx], SA_LEN(ia[0])) == 0)) {
  		rtpp_log_write(RTPP_LOG_INFO, spa->log, "pre-filling %s's address "
***************
*** 940,946 ****
  		spa->addr[pidx] = ia[0];
  		ia[0] = NULL;
  	    }
! 	    if (spa->rtcp->untrusted_addr == 0 && !(spa->rtcp->addr[pidx] != NULL &&
  	      SA_LEN(ia[1]) == SA_LEN(spa->rtcp->addr[pidx]) &&
  	      memcmp(ia[1], spa->rtcp->addr[pidx], SA_LEN(ia[1])) == 0)) {
  		if (spa->rtcp->addr[pidx] != NULL)
--- 940,946 ----
  		spa->addr[pidx] = ia[0];
  		ia[0] = NULL;
  	    }
! 	    if (spa->rtcp->untrusted_addr[pidx] == 0 && !(spa->rtcp->addr[pidx] != NULL &&
  	      SA_LEN(ia[1]) == SA_LEN(spa->rtcp->addr[pidx]) &&
  	      memcmp(ia[1], spa->rtcp->addr[pidx], SA_LEN(ia[1])) == 0)) {
  		if (spa->rtcp->addr[pidx] != NULL)