[asterisk-dev] Re: [asterisk-commits] oej: trunk r47194 - /trunk/channels/chan_sip.c

Luigi Rizzo rizzo at icir.org
Sat Nov 4 12:20:20 MST 2006


On Sat, Nov 04, 2006 at 05:45:47PM -0000, asterisk-commits at lists.digium.com wrote:
> Author: oej
> Date: Sat Nov  4 11:45:47 2006
> New Revision: 47194
> 
> URL: http://svn.digium.com/view/asterisk?rev=47194&view=rev
> Log:
> Reverting rev 47093 until we have an agreement on how to 
> implement this, if at all.

so please tell us what is your opinion on the matter and what is
the procedure to reach an agreement.

i asked this specific change on the list, we discussed a bit on how
i thought it was useful.  i did not see any explaination from you
(or others, if it matters) on why you consider this code harmful.

if your point is that you (or anyone else) have the authority to
veto changes to chan_sip.c (or anything else), fine, but then
understand that it has obvious consequences.

	cheers
	luigi

> Modified:
>     trunk/channels/chan_sip.c
> 
> Modified: trunk/channels/chan_sip.c
> URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=47194&r1=47193&r2=47194&view=diff
> ==============================================================================
> --- trunk/channels/chan_sip.c (original)
> +++ trunk/channels/chan_sip.c Sat Nov  4 11:45:47 2006
> @@ -1076,7 +1076,6 @@
>  	char mohinterpret[MAX_MUSICCLASS];/*!<  Music on Hold class */
>  	char mohsuggest[MAX_MUSICCLASS];/*!<  Music on Hold class */
>  	char useragent[256];		/*!<  User agent in SIP request (saved from registration) */
> -	char register_from_hdr[256];	/*!<  'From' header received in REGISTER */
>  	struct ast_codec_pref prefs;	/*!<  codec prefs */
>  	int lastmsgssent;
>  	time_t	lastmsgcheck;		/*!<  Last time we checked for MWI */
> @@ -7608,7 +7607,6 @@
>  
>  
>  /*! \brief Parse contact header and save registration (peer registration) */
> -/* XXX it actually does a bit more than this e.g. useragent */
>  static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, struct sip_peer *peer, struct sip_request *req)
>  {
>  	char contact[BUFSIZ]; 
> @@ -7735,10 +7733,6 @@
>  		ast_copy_string(peer->useragent, useragent, sizeof(peer->useragent));
>  		if (option_verbose > 3)
>  			ast_verbose(VERBOSE_PREFIX_3 "Saved useragent \"%s\" for peer %s\n", peer->useragent, peer->name);  
> -	}
> -	{ const char *from = get_header(req, "From");
> -		if (!ast_strlen_zero(from))
> -			get_calleridname(from, peer->register_from_hdr, sizeof(peer->register_from_hdr));
>  	}
>  	return PARSE_REGISTER_UPDATE;
>  }
> @@ -9036,11 +9030,6 @@
>  		ast_verbose("Found peer '%s' for '%s' from %s:%d\n",
>  			peer->name, of, ast_inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port));
>  
> -#if 0	/* this is done for users, why not for peers ? */
> -	/* copy channel vars */
> -	p->chanvars = copy_vars(peer->chanvars);
> -	p->prefs = peer->prefs;
> -#endif
>  	/* XXX what about p->prefs = peer->prefs; ? */
>  	/* Set Frame packetization */
>  	if (p->rtp) {
> @@ -9614,7 +9603,6 @@
>  			"VideoSupport: %s\r\n"
>  			"ACL: %s\r\n"
>  			"Status: %s\r\n"
> -			"RegisterFrom: %s\r\n"
>  			"RealtimeDevice: %s\r\n\r\n", 
>  			idtext,
>  			iterator->name, 
> @@ -9625,7 +9613,6 @@
>  			ast_test_flag(&iterator->flags[1], SIP_PAGE2_VIDEOSUPPORT) ? "yes" : "no",	/* VIDEOSUPPORT=yes? */
>  			iterator->ha ? "yes" : "no",       /* permit/deny */
>  			status,
> -			iterator->register_from_hdr,
>  			realtimepeers ? (ast_test_flag(&iterator->flags[0], SIP_REALTIME) ? "yes":"no") : "no");
>  		}
>  
> 
> _______________________________________________
> --Bandwidth and Colocation provided by Easynews.com --
> 
> asterisk-commits mailing list
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/asterisk-commits


More information about the asterisk-dev mailing list