Changeset e25e47662420fc69da94bd54e36cc09fd8379dec

Timestamp:

04/07/03 16:06:48 (5 years ago)

Author:

Mohammed Adnène Trojette <adn@videolan.org>

git-committer:

Mohammed Adnène Trojette <adn@videolan.org> 1057327608 +0000

git-parent:

[348be7c1796d2d0f94e4d4e0016237dea950de9e]

git-author:

Mohammed Adnène Trojette <adn@videolan.org> 1057327608 +0000

Message:

* Fix Bug thanks to Cif: url form was "IP:port" and port 1234 was

systematically sent separately.

* Multicast IP form is "@IP" and not "IP". Right ?

Files:

• src/stream_output/announce.c (modified) (3 diffs)

src/stream_output/announce.c

@@ -47 +47 @@
-#define SAP_IPV6_ADDR_2 "::2:7FFE"
-
+/****************************************************************************
+ *  Split : split a string into two parts: the one which is before the delim
+ *               and the one which is after.
+ *               NULL is returned if delim is not found
+ ****************************************************************************/
+
+static char * split( char *p_in, char *p_out1, char *p_out2, char delim)
+{
+    unsigned int i_count=0; /*pos in input string*/
+    unsigned int i_pos1=0; /*pos in out2 string */
+    unsigned int i_pos2=0; 
+    char *p_cur; /*store the pos of the first delim found */
+    
+    /*skip spaces at the beginning*/
+    while(p_in[i_count] == ' ' && i_count < strlen(p_in))
+    {
+        i_count++;
+    }
+    if(i_count == strlen(p_in))
+        return NULL;
+    
+    /*Look for delim*/
+    while(p_in[i_count] != delim && i_count < strlen(p_in))
+    {
+        p_out1[i_pos1] = p_in[i_count];
+        i_count++;
+        i_pos1++;
+    }
+    /* Mark the end of out1 */
+    p_out1[i_pos1] = 0;
+    
+    if(i_count == strlen(p_in))
+        return NULL;
+    
+    /*store pos of the first delim*/
+    p_cur = &p_in[i_count];
+    
+    
+    
+    /*skip all delim and all spaces*/
+    while((p_in[i_count] == ' ' || p_in[i_count] == delim) && i_count < strlen(p_in))
+    {
+        i_count++;
+    }
+    
+    if(i_count == strlen(p_in))
+        return p_cur;
+    
+    /*Store the second string*/
+    while(i_count < strlen(p_in))
+    {
+        p_out2[i_pos2] = p_in[i_count];
+        i_pos2++;
+        i_count++;
+    }
+    p_out2[i_pos2] = 0;
+    
+    return p_cur;
+}
+
-/*****************************************************************************
- * sout_SAPNew: Creates a SAP Session
@@ -68 +128 @@
-        return NULL;
-    }
-
+
-    /* Fill the information in the structure */
-
+
+
-    sprintf ( p_new->psz_name , "%s" , psz_name_arg );
+
-    /* Port is not implemented in sout */
-
+//
-
-    p_new->i_ip_version = ip_version;
@@ -222 +284 @@
-                          "t=0 0\n"
-                          "m=audio %s udp 14\n"
-
+@
-                          "a=type:test\n",
-                 p_this->psz_name , p_this->psz_port , p_this->psz_url );
-
+
+
-        i_msg_size = strlen( sap_msg );
-        i_size = i_msg_size + i_header_size;