From 9589a73b42cbfb2754e09703bfd82a8c4dd1276f Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Fri, 25 Jan 2013 10:35:01 -0500
Subject: [PATCH] obsolete call{ed,ing}_agent element

---
 daemon/call.c | 10 +---------
 daemon/call.h |  2 --
 daemon/main.c |  2 --
 daemon/sdp.c  |  1 +
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/daemon/call.c b/daemon/call.c
index 1e674571a..a52096b9c 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -1669,7 +1669,6 @@ str *call_update_udp(char **out, struct callmaster *m) {
 
 	c = call_get_or_create(&callid, &viabranch, m);
 	log_info = &viabranch;
-	c->calling_agent = "UNKNOWN(udp)";
 
 	if (addr_parse_udp(&st, out))
 		goto fail;
@@ -1727,7 +1726,6 @@ str *call_lookup_udp(char **out, struct callmaster *m) {
 		(void *) 0x1);
 
 	log_info = &branch;
-	c->called_agent = "UNKNOWN(udp)";
 
 	if (addr_parse_udp(&st, out))
 		goto fail;
@@ -1766,8 +1764,6 @@ str *call_request(char **out, struct callmaster *m) {
 	str_init(&callid, out[RE_TCP_RL_CALLID]);
 	c = call_get_or_create(&callid, NULL, m);
 
-	c->calling_agent = (out[RE_TCP_RL_AGENT] && *out[RE_TCP_RL_AGENT])
-		? call_strdup(c, out[RE_TCP_RL_AGENT]) : "UNKNOWN";
 	info_parse(out[RE_TCP_RL_INFO], c);
 	streams_parse(out[RE_TCP_RL_STREAMS], m, &s);
 	num = call_streams(c, &s, g_hash_table_lookup(c->infohash, "fromtag"), 0);
@@ -1801,8 +1797,6 @@ str *call_lookup(char **out, struct callmaster *m) {
 	mutex_lock(&c->lock);
 	rwlock_unlock_r(&m->hashlock);
 
-	c->called_agent = (out[RE_TCP_RL_AGENT] && *out[RE_TCP_RL_AGENT])
-		? call_strdup(c, out[RE_TCP_RL_AGENT]) : "UNKNOWN";
 	info_parse(out[RE_TCP_RL_INFO], c);
 	streams_parse(out[RE_TCP_RL_STREAMS], m, &s);
 	num = call_streams(c, &s, g_hash_table_lookup(c->infohash, "totag"), 1);
@@ -2023,9 +2017,8 @@ static void call_status_iterator(struct call *c, struct control_stream *s) {
 
 	from = g_hash_table_lookup(c->infohash, "from");
 	to = g_hash_table_lookup(c->infohash, "to");
-	control_stream_printf(s, "session %.*s %.*s %.*s %s %s %i\n",
+	control_stream_printf(s, "session %.*s %.*s %.*s - - %i\n",
 		STR_FMT(&c->callid), STR_FMT(from), STR_FMT(to),
-		c->calling_agent, c->called_agent,
 		(int) (poller_now - c->created));
 
 	for (l = c->callstreams->head; l; l = l->next) {
@@ -2160,7 +2153,6 @@ const char *call_offer(bencode_item_t *input, struct callmaster *m, bencode_item
 
 	call = call_get_or_create(&callid, &viabranch, m);
 	log_info = &viabranch;
-	call->calling_agent = "UNKNOWN(ng)"; /* XXX get rid of, or make use of */
 
 	num = call_streams(call, &streams, &fromtag, 0);
 	sdp_new = sdp_replace(&sdp, &parsed, call, abs(num), (num >= 0) ? 0 : 1);
diff --git a/daemon/call.h b/daemon/call.h
index c0e06cadf..bba438a2c 100644
--- a/daemon/call.h
+++ b/daemon/call.h
@@ -96,8 +96,6 @@ struct call {
 	mutex_t			lock;
 	GQueue			*callstreams;
 	GHashTable		*branches;
-	char			*calling_agent;
-	char			*called_agent;
 
 	str			callid;
 	char			redis_uuid[37];
diff --git a/daemon/main.c b/daemon/main.c
index d36434ce2..3960b33fa 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -348,8 +348,6 @@ void redis_mod_verify(void *dlh) {
 	check_struct_offset(call, callstreams);
 	check_struct_offset(call, branches);
 	check_struct_offset(call, callid);
-	check_struct_offset(call, calling_agent);
-	check_struct_offset(call, called_agent);
 
 	check_struct_offset(callstream, peers);
 	check_struct_offset(callstream, call);
diff --git a/daemon/sdp.c b/daemon/sdp.c
index 33fb73847..79d4e97fa 100644
--- a/daemon/sdp.c
+++ b/daemon/sdp.c
@@ -451,6 +451,7 @@ static void chopper_destroy(struct string_chopper *chop) {
 /* XXX use stream numbers as index */
 /* XXX use port numbers as index */
 /* XXX get rid of num/off parameters? */
+/* XXX use iovec based rewriting */
 str *sdp_replace(str *body, GQueue *sessions, struct call *call, int num, int off) {
 	struct sdp_session *session;
 	struct sdp_media *media;