Changeset 150:5e24ab07af1f in verona

Timestamp:

Mar 22, 2011 2:17:50 PM (2 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Message:

fix some memleaks in phapi

Files:

• phapi/phapi.c (modified) (9 diffs)
• phapi/phms.c (modified) (2 diffs)
• phapi/sdphandler.c (modified) (3 diffs)
• phapi/sdphandler.h (modified) (1 diff)
• phtest/phtests_core.cpp (modified) (2 diffs)

phapi/phapi.c

@@ -710 +710 @@
                 osip_list_init(&ca->result_payloads);
 
-                if (je->request && MSG_IS_INVITE(je->request) && !ca->remote_sdp)
+                if (je->request && MSG_IS_INVITE(je->request) && !ca->remote_sdp && !ca->state == PH_CALLER)
                 {
                         char *sdp = ph_req_get_body(je->request);
@@ -759 +759 @@
         for(i = 0; (i < PH_STREAM_MAX_ATTRS) && sp->attrs[i]; i++)
                 free((void *) sp->attrs[i]);
+        free(sp);
 }
 
@@ -834 +835 @@
 ph_find_stream(struct ph_stream_params  **streams, const char *strtype, int maxstrs);
 
-static void ph_mfree(void *data)
-{
-        osip_free(data);
-}
-
-
 void ph_release_call(phcall_t *ca)
 {
@@ -859 +854 @@
                 sdp_context_free(ca->sdpctx);
 
-        osip_list_special_free(&ca->audio_payloads, ph_mfree);
-        osip_list_special_free(&ca->result_payloads, ph_mfree);
-
-        osip_list_special_free(&ca->video_payloads, ph_mfree);
+        osip_list_special_free(&ca->audio_payloads, sdp_payload_free);
+        osip_list_special_free(&ca->result_payloads, sdp_payload_free);
+
+        osip_list_special_free(&ca->video_payloads, sdp_payload_free);
 
         memset(ca, 0, sizeof(phcall_t));
@@ -3574 +3569 @@
         if (ph_media_supported_payload(&rtppt, ptstring))
         {
-                //if (g722hack)
-                // pt.rate = 8000;
                 sdp_payload_list_add(&ph_audio_payloads, rtp_profile_get_payload_number_from_rtpmap(&av_profile, ptstring), payload_type_get_rtpmap(rtppt), 0);
-                return;
-        }
-        printf("...setup refused %s- not found in ortp profile or not supported by mediastreamer\n", ptstring);
+        } else
+                DBG_CODEC_LOOKUP("...setup refused %s- not found in ortp profile or not supported by mediastreamer\n", ptstring);
 }
 
@@ -4215 +4207 @@
 }
 
-
+static void ph_payload_cleanup()
+{
+        if (osip_list_size(&ph_audio_payloads) > 0)
+                osip_list_special_free(&ph_audio_payloads, sdp_payload_free);
+        if (osip_list_size(&ph_video_payloads) > 0)
+                osip_list_special_free(&ph_video_payloads, sdp_payload_free);
+}
 
 /**
@@ -4276 +4274 @@
 
         ph_media_cleanup();
+        ph_payload_cleanup();
 
         osip_mutex_destroy(ph_media_start_mutex);
@@ -6343 +6342 @@
 }
 
-static void *custom_hdr_free(void *obj)
+static void custom_hdr_free(void *obj)
 {
     struct ph_custom_hdr *hdr = (struct ph_custom_hdr *) obj;
@@ -6351 +6350 @@
     osip_free(hdr->hdrvalue);
     osip_free(hdr);
-    return 0;
 }
 

phapi/phms.c

@@ -90 +90 @@
 int ph_media_cleanup()
 {
+        ms_exit();
         return 0;
 }
@@ -578 +579 @@
                 rtp_profile_destroy(audio1->profile);
                 audio1->flags = 0;
+                osip_free(audio1->streamerData);
                 s->activestreams &= ~(1 << PH_MSTREAM_AUDIO1);
         }

phapi/sdphandler.c

@@ -61 +61 @@
 
 int
-sdp_payload_list_add(struct osip_list* list, int pt, const char *rtpmap, int line)
+sdp_payload_list_add(struct osip_list* list, int pt, char *rtpmap, int line)
 {
         sdp_payload_t *payload = osip_malloc(sizeof(*payload));
@@ -68 +68 @@
         payload->pt = pt;
         payload->line = line;
-        payload->a_rtpmap = osip_strdup(rtpmap);
+        //allocated by payload_type_get_rtpmap() 
+        payload->a_rtpmap = rtpmap;
+        
         return osip_list_add(list, payload, -1);
 }
@@ -85 +87 @@
         (*dst)->a_rtpmap = osip_strdup(src->a_rtpmap);
         return 0;
+}
+
+void sdp_payload_free(void *data)
+{
+        sdp_payload_t * payload = data;
+        osip_free(payload->a_rtpmap);
+        osip_free(payload);
 }
 

phapi/sdphandler.h

@@ -100 +100 @@
 
 int sdp_payload_init (sdp_payload_t * payload);
+void sdp_payload_free(void *data);
 int sdp_payload_clone(void *src, void **dst);
 int sdp_equal_payload(const sdp_payload_t *cur_payload, const sdp_payload_t *payload);
-int sdp_payload_list_add(struct osip_list* list, int pt, const char *rtpmap, int line);
+int sdp_payload_list_add(struct osip_list* list, int pt, char *rtpmap, int line);
 #endif

phtest/phtests_core.cpp

@@ -156 +156 @@
                         printf("INCALL line=%d cid=%d to=%s from=%s streams=%x callinfo=%s\n", info->vlid, cid,
                                         info->localUri, info->remoteUri, info->streams, nz(info->callinfo));
-                        this->ringingCall(cid);
+                        //this->ringingCall(cid);
+                        this->acceptCall(cid, 0, PH_STREAM_AUDIO);
                         break;
 
@@ -232 +233 @@
                 delete funcTab[i];
         delete [] funcTab;
+        delete [] funcNum;
         delete [] name;
 }