? .rtspmessage.c.swp
? rtsp.diff
Index: gstrtspsrc.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/gstrtspsrc.c,v
retrieving revision 1.29
diff -u -3 -p -b -B -d -r1.29 gstrtspsrc.c
--- gstrtspsrc.c	15 Jul 2006 15:25:05 -0000	1.29
+++ gstrtspsrc.c	16 Jul 2006 19:36:09 -0000
@@ -873,6 +873,344 @@ error_response:
   }
 }
 
+/*
+ * The following code has been copied from
+ * xine-lib-1.1.1/src/input/libreal/real.c.
+ */
+
+#include <stdint.h>
+
+#define be2me_32(x) GUINT32_SWAP_LE_BE_CONSTANT(x)
+#define le2me_32(x) GUINT32_SWAP_LE_BE_CONSTANT(x)
+
+#define ALE_32(x) (le2me_32(*(uint32_t*)(x)))
+#define LE_32(x) ALE_32(x)
+
+#define BE_32C(x,y) do { *(uint32_t *)(x) = be2me_32((y)); } while(0)
+#define LE_32C(x,y) do { *(uint32_t *)(x) = le2me_32((y)); } while(0)
+
+const unsigned char xor_table[] = {
+  0x05, 0x18, 0x74, 0xd0, 0x0d, 0x09, 0x02, 0x53,
+  0xc0, 0x01, 0x05, 0x05, 0x67, 0x03, 0x19, 0x70,
+  0x08, 0x27, 0x66, 0x10, 0x10, 0x72, 0x08, 0x09,
+  0x63, 0x11, 0x03, 0x71, 0x08, 0x08, 0x70, 0x02,
+  0x10, 0x57, 0x05, 0x18, 0x54, 0x00, 0x00, 0x00 };
+
+static void hash(char *field, char *param) {
+
+  uint32_t a, b, c, d;
+
+
+  /* fill variables */
+  a = LE_32(field);
+  b = LE_32(field+4);
+  c = LE_32(field+8);
+  d = LE_32(field+12);
+
+  a = ((b & c) | (~b & d)) + LE_32((param+0x00)) + a - 0x28955B88;
+  a = ((a << 0x07) | (a >> 0x19)) + b;
+  d = ((a & b) | (~a & c)) + LE_32((param+0x04)) + d - 0x173848AA;
+  d = ((d << 0x0c) | (d >> 0x14)) + a;
+  c = ((d & a) | (~d & b)) + LE_32((param+0x08)) + c + 0x242070DB;
+  c = ((c << 0x11) | (c >> 0x0f)) + d;
+  b = ((c & d) | (~c & a)) + LE_32((param+0x0c)) + b - 0x3E423112;
+  b = ((b << 0x16) | (b >> 0x0a)) + c;
+  a = ((b & c) | (~b & d)) + LE_32((param+0x10)) + a - 0x0A83F051;
+  a = ((a << 0x07) | (a >> 0x19)) + b;
+  d = ((a & b) | (~a & c)) + LE_32((param+0x14)) + d + 0x4787C62A;
+  d = ((d << 0x0c) | (d >> 0x14)) + a;
+  c = ((d & a) | (~d & b)) + LE_32((param+0x18)) + c - 0x57CFB9ED;
+  c = ((c << 0x11) | (c >> 0x0f)) + d;
+  b = ((c & d) | (~c & a)) + LE_32((param+0x1c)) + b - 0x02B96AFF;
+  b = ((b << 0x16) | (b >> 0x0a)) + c;
+  a = ((b & c) | (~b & d)) + LE_32((param+0x20)) + a + 0x698098D8;
+  a = ((a << 0x07) | (a >> 0x19)) + b;
+  d = ((a & b) | (~a & c)) + LE_32((param+0x24)) + d - 0x74BB0851;
+  d = ((d << 0x0c) | (d >> 0x14)) + a;
+  c = ((d & a) | (~d & b)) + LE_32((param+0x28)) + c - 0x0000A44F;
+  c = ((c << 0x11) | (c >> 0x0f)) + d;
+  b = ((c & d) | (~c & a)) + LE_32((param+0x2C)) + b - 0x76A32842;
+  b = ((b << 0x16) | (b >> 0x0a)) + c;
+  a = ((b & c) | (~b & d)) + LE_32((param+0x30)) + a + 0x6B901122;
+  a = ((a << 0x07) | (a >> 0x19)) + b;
+  d = ((a & b) | (~a & c)) + LE_32((param+0x34)) + d - 0x02678E6D;
+  d = ((d << 0x0c) | (d >> 0x14)) + a;
+  c = ((d & a) | (~d & b)) + LE_32((param+0x38)) + c - 0x5986BC72;
+  c = ((c << 0x11) | (c >> 0x0f)) + d;
+  b = ((c & d) | (~c & a)) + LE_32((param+0x3c)) + b + 0x49B40821;
+  b = ((b << 0x16) | (b >> 0x0a)) + c;
+
+  a = ((b & d) | (~d & c)) + LE_32((param+0x04)) + a - 0x09E1DA9E;
+  a = ((a << 0x05) | (a >> 0x1b)) + b;
+  d = ((a & c) | (~c & b)) + LE_32((param+0x18)) + d - 0x3FBF4CC0;
+  d = ((d << 0x09) | (d >> 0x17)) + a;
+  c = ((d & b) | (~b & a)) + LE_32((param+0x2c)) + c + 0x265E5A51;
+  c = ((c << 0x0e) | (c >> 0x12)) + d;
+  b = ((c & a) | (~a & d)) + LE_32((param+0x00)) + b - 0x16493856;
+  b = ((b << 0x14) | (b >> 0x0c)) + c;
+  a = ((b & d) | (~d & c)) + LE_32((param+0x14)) + a - 0x29D0EFA3;
+  a = ((a << 0x05) | (a >> 0x1b)) + b;
+  d = ((a & c) | (~c & b)) + LE_32((param+0x28)) + d + 0x02441453;
+  d = ((d << 0x09) | (d >> 0x17)) + a;
+  c = ((d & b) | (~b & a)) + LE_32((param+0x3c)) + c - 0x275E197F;
+  c = ((c << 0x0e) | (c >> 0x12)) + d;
+  b = ((c & a) | (~a & d)) + LE_32((param+0x10)) + b - 0x182C0438;
+  b = ((b << 0x14) | (b >> 0x0c)) + c;
+  a = ((b & d) | (~d & c)) + LE_32((param+0x24)) + a + 0x21E1CDE6;
+  a = ((a << 0x05) | (a >> 0x1b)) + b;
+  d = ((a & c) | (~c & b)) + LE_32((param+0x38)) + d - 0x3CC8F82A;
+  d = ((d << 0x09) | (d >> 0x17)) + a;
+  c = ((d & b) | (~b & a)) + LE_32((param+0x0c)) + c - 0x0B2AF279;
+  c = ((c << 0x0e) | (c >> 0x12)) + d;
+  b = ((c & a) | (~a & d)) + LE_32((param+0x20)) + b + 0x455A14ED;
+  b = ((b << 0x14) | (b >> 0x0c)) + c;
+  a = ((b & d) | (~d & c)) + LE_32((param+0x34)) + a - 0x561C16FB;
+  a = ((a << 0x05) | (a >> 0x1b)) + b;
+  d = ((a & c) | (~c & b)) + LE_32((param+0x08)) + d - 0x03105C08;
+  d = ((d << 0x09) | (d >> 0x17)) + a;
+  c = ((d & b) | (~b & a)) + LE_32((param+0x1c)) + c + 0x676F02D9;
+  c = ((c << 0x0e) | (c >> 0x12)) + d;
+  b = ((c & a) | (~a & d)) + LE_32((param+0x30)) + b - 0x72D5B376;
+  b = ((b << 0x14) | (b >> 0x0c)) + c;
+
+  a = (b ^ c ^ d) + LE_32((param+0x14)) + a - 0x0005C6BE;
+  a = ((a << 0x04) | (a >> 0x1c)) + b;
+  d = (a ^ b ^ c) + LE_32((param+0x20)) + d - 0x788E097F;
+  d = ((d << 0x0b) | (d >> 0x15)) + a;
+  c = (d ^ a ^ b) + LE_32((param+0x2c)) + c + 0x6D9D6122;
+  c = ((c << 0x10) | (c >> 0x10)) + d;
+  b = (c ^ d ^ a) + LE_32((param+0x38)) + b - 0x021AC7F4;
+  b = ((b << 0x17) | (b >> 0x09)) + c;
+  a = (b ^ c ^ d) + LE_32((param+0x04)) + a - 0x5B4115BC;
+  a = ((a << 0x04) | (a >> 0x1c)) + b;
+  d = (a ^ b ^ c) + LE_32((param+0x10)) + d + 0x4BDECFA9;
+  d = ((d << 0x0b) | (d >> 0x15)) + a;
+  c = (d ^ a ^ b) + LE_32((param+0x1c)) + c - 0x0944B4A0;
+  c = ((c << 0x10) | (c >> 0x10)) + d;
+  b = (c ^ d ^ a) + LE_32((param+0x28)) + b - 0x41404390;
+  b = ((b << 0x17) | (b >> 0x09)) + c;
+  a = (b ^ c ^ d) + LE_32((param+0x34)) + a + 0x289B7EC6;
+  a = ((a << 0x04) | (a >> 0x1c)) + b;
+  d = (a ^ b ^ c) + LE_32((param+0x00)) + d - 0x155ED806;
+  d = ((d << 0x0b) | (d >> 0x15)) + a;
+  c = (d ^ a ^ b) + LE_32((param+0x0c)) + c - 0x2B10CF7B;
+  c = ((c << 0x10) | (c >> 0x10)) + d;
+  b = (c ^ d ^ a) + LE_32((param+0x18)) + b + 0x04881D05;
+  b = ((b << 0x17) | (b >> 0x09)) + c;
+  a = (b ^ c ^ d) + LE_32((param+0x24)) + a - 0x262B2FC7;
+  a = ((a << 0x04) | (a >> 0x1c)) + b;
+  d = (a ^ b ^ c) + LE_32((param+0x30)) + d - 0x1924661B;
+  d = ((d << 0x0b) | (d >> 0x15)) + a;
+  c = (d ^ a ^ b) + LE_32((param+0x3c)) + c + 0x1fa27cf8;
+  c = ((c << 0x10) | (c >> 0x10)) + d;
+  b = (c ^ d ^ a) + LE_32((param+0x08)) + b - 0x3B53A99B;
+  b = ((b << 0x17) | (b >> 0x09)) + c;
+  b = ((b << 0x17) | (b >> 0x09)) + c;
+
+  a = ((~d | b) ^ c)  + LE_32((param+0x00)) + a - 0x0BD6DDBC;
+  a = ((a << 0x06) | (a >> 0x1a)) + b;
+  d = ((~c | a) ^ b)  + LE_32((param+0x1c)) + d + 0x432AFF97;
+  d = ((d << 0x0a) | (d >> 0x16)) + a;
+  c = ((~b | d) ^ a)  + LE_32((param+0x38)) + c - 0x546BDC59;
+  c = ((c << 0x0f) | (c >> 0x11)) + d;
+  b = ((~a | c) ^ d)  + LE_32((param+0x14)) + b - 0x036C5FC7;
+  b = ((b << 0x15) | (b >> 0x0b)) + c;
+  a = ((~d | b) ^ c)  + LE_32((param+0x30)) + a + 0x655B59C3;
+  a = ((a << 0x06) | (a >> 0x1a)) + b;
+  d = ((~c | a) ^ b)  + LE_32((param+0x0C)) + d - 0x70F3336E;
+  d = ((d << 0x0a) | (d >> 0x16)) + a;
+  c = ((~b | d) ^ a)  + LE_32((param+0x28)) + c - 0x00100B83;
+  c = ((c << 0x0f) | (c >> 0x11)) + d;
+  b = ((~a | c) ^ d)  + LE_32((param+0x04)) + b - 0x7A7BA22F;
+  b = ((b << 0x15) | (b >> 0x0b)) + c;
+  a = ((~d | b) ^ c)  + LE_32((param+0x20)) + a + 0x6FA87E4F;
+  a = ((a << 0x06) | (a >> 0x1a)) + b;
+  d = ((~c | a) ^ b)  + LE_32((param+0x3c)) + d - 0x01D31920;
+  d = ((d << 0x0a) | (d >> 0x16)) + a;
+  c = ((~b | d) ^ a)  + LE_32((param+0x18)) + c - 0x5CFEBCEC;
+  c = ((c << 0x0f) | (c >> 0x11)) + d;
+  b = ((~a | c) ^ d)  + LE_32((param+0x34)) + b + 0x4E0811A1;
+  b = ((b << 0x15) | (b >> 0x0b)) + c;
+  a = ((~d | b) ^ c)  + LE_32((param+0x10)) + a - 0x08AC817E;
+  a = ((a << 0x06) | (a >> 0x1a)) + b;
+  d = ((~c | a) ^ b)  + LE_32((param+0x2c)) + d - 0x42C50DCB;
+  d = ((d << 0x0a) | (d >> 0x16)) + a;
+  c = ((~b | d) ^ a)  + LE_32((param+0x08)) + c + 0x2AD7D2BB;
+  c = ((c << 0x0f) | (c >> 0x11)) + d;
+  b = ((~a | c) ^ d)  + LE_32((param+0x24)) + b - 0x14792C6F;
+  b = ((b << 0x15) | (b >> 0x0b)) + c;
+
+  a += LE_32(field);
+  b += LE_32(field+4);
+  c += LE_32(field+8);
+  d += LE_32(field+12);
+
+  LE_32C(field, a);
+  LE_32C(field+4, b);
+  LE_32C(field+8, c);
+  LE_32C(field+12, d);
+}
+
+static void
+call_hash (char *key, char *challenge, int len)
+{
+  uint8_t *ptr1, *ptr2;
+  uint32_t a, b, c, d, tmp;
+
+  ptr1=((uint8_t *) key+16);
+  ptr2=((uint8_t *) key+20);
+
+  a = LE_32(ptr1);
+  b = (a >> 3) & 0x3f;
+  a += len * 8;
+  LE_32C(ptr1, a);
+
+  if (a < (len << 3))
+  {
+    ptr2 += 4;
+  }
+
+  tmp = LE_32(ptr2) + (len >> 0x1d);
+  LE_32C(ptr2, tmp);
+  a = 64 - b;
+  c = 0;
+  if (a <= len)
+  {
+
+    memcpy(key+b+24, challenge, a);
+    hash(key, key+24);
+    c = a;
+    d = c + 0x3f;
+
+    while ( d < len ) {
+      hash(key, challenge+d-0x3f);
+      d += 64;
+      c += 64;
+    }
+    b = 0;
+  }
+
+  memcpy(key+b+24, challenge+c, len-c);
+}
+
+static void
+calc_response (char *result, char *field)
+{
+  char buf1[128];
+  char buf2[128];
+  int i;
+
+  memset (buf1, 0, 64);
+  *buf1 = 128;
+
+  memcpy (buf2, field+16, 8);
+
+  i = ( LE_32((buf2)) >> 3 ) & 0x3f;
+
+  if (i < 56) {
+    i = 56 - i;
+  } else {
+    i = 120 - i;
+  }
+
+  call_hash (field, buf1, i);
+  call_hash (field, buf2, 8);
+
+  memcpy (result, field, 16);
+
+}
+
+static void
+calc_response_string (char *result, char *challenge)
+{
+  char field[128];
+  char zres[20];
+  int  i;
+
+  /* initialize our field */
+  BE_32C (field,      0x01234567);
+  BE_32C ((field+4),  0x89ABCDEF);
+  BE_32C ((field+8),  0xFEDCBA98);
+  BE_32C ((field+12), 0x76543210);
+  BE_32C ((field+16), 0x00000000);
+  BE_32C ((field+20), 0x00000000);
+
+  /* calculate response */
+  call_hash(field, challenge, 64);
+  calc_response(zres,field);
+
+  /* convert zres to ascii string */
+  for (i=0; i<16; i++ ) {
+    char a, b;
+
+    a = (zres[i] >> 4) & 15;
+    b = zres[i] & 15;
+
+    result[i*2]   = ((a<10) ? (a+48) : (a+87)) & 255;
+    result[i*2+1] = ((b<10) ? (b+48) : (b+87)) & 255;
+  }
+}
+
+static void
+real_calc_response_and_checksum (gchar *response,
+    gchar *chksum, const gchar *challenge)
+{
+  int   ch_len, table_len, resp_len;
+  int   i;
+  char *ptr;
+  char  buf[128];
+
+  /* initialize return values */
+  memset(response, 0, 64);
+  memset(chksum, 0, 34);
+
+  /* initialize buffer */
+  memset(buf, 0, 128);
+  ptr=buf;
+  BE_32C(ptr, 0xa1e9149d);
+  ptr+=4;
+  BE_32C(ptr, 0x0e6b3b59);
+  ptr+=4;
+
+  /* some (length) checks */
+  if (challenge != NULL)
+  {
+    ch_len = strlen (challenge);
+
+    if (ch_len == 40) /* what a hack... */
+    {
+      ((gchar *) challenge)[32]=0;
+      ch_len=32;
+    }
+    if ( ch_len > 56 ) ch_len=56;
+
+    /* copy challenge to buf */
+    memcpy(ptr, challenge, ch_len);
+  }
+
+  if (xor_table != NULL)
+  {
+    table_len = strlen((char *) xor_table);
+
+    if (table_len > 56) table_len=56;
+
+    /* xor challenge bytewise with xor_table */
+    for (i=0; i<table_len; i++)
+      ptr[i] = ptr[i] ^ xor_table[i];
+  }
+  calc_response_string (response, buf);
+
+  /* add tail */
+  resp_len = strlen (response);
+  strcpy (&response[resp_len], "01d0a8e3");
+
+  /* calculate checksum */
+  for (i=0; i<resp_len/4; i++)
+    chksum[i] = response[i*4];
+}
+
+/* End of code copied from xine */
+
 static gboolean
 gst_rtspsrc_open (GstRTSPSrc * src)
 {
@@ -884,6 +1222,8 @@ gst_rtspsrc_open (GstRTSPSrc * src)
   guint size;
   SDPMessage sdp = { 0 };
   GstRTSPProto protocols;
+  gchar *server = NULL;
+  const gchar *challenge1 = NULL;
 
   /* parse url */
   GST_DEBUG ("parsing url...");
@@ -907,6 +1247,18 @@ gst_rtspsrc_open (GstRTSPSrc * src)
   if (!gst_rtspsrc_send (src, &request, &response, NULL))
     goto send_error;
 
+  /* Real servers don't follow the specification. */
+  rtsp_message_get_header (&response, RTSP_HDR_SERVER, &server);
+  if (server && strstr (server, "Real")) {
+    if ((res = rtsp_message_init_request (RTSP_OPTIONS, src->location,
+            &request)) < 0)
+      goto create_request_failed;
+    rtsp_message_add_custom_header (&request, "ClientChallenge",
+        "9e26d33f2984236010ef6253fb1887f7");
+    if (!gst_rtspsrc_send (src, &request, &response, NULL))
+      goto send_error;
+  }
+
   {
     gchar *respoptions = NULL;
     gchar **options;
@@ -963,6 +1316,9 @@ gst_rtspsrc_open (GstRTSPSrc * src)
   /* we accept SDP for now */
   rtsp_message_add_header (&request, RTSP_HDR_ACCEPT, "application/sdp");
 
+  /* Again, special attention to Real servers */
+  rtsp_message_get_custom_header (&response, "RealChallenge1", &challenge1);
+
   /* send DESCRIBE */
   GST_DEBUG ("send describe...");
   if (!gst_rtspsrc_send (src, &request, &response, NULL))
@@ -1072,6 +1428,16 @@ gst_rtspsrc_open (GstRTSPSrc * src)
       rtsp_message_add_header (&request, RTSP_HDR_TRANSPORT, transports);
       g_free (transports);
 
+      /* And again, special attention to Real servers. */
+      if (challenge1) {
+        gchar *value, checksum[34], challenge2[64];
+
+        real_calc_response_and_checksum (challenge2, checksum, challenge1);
+        value = g_strdup_printf ("%s, sd=%s", challenge2, checksum);
+        rtsp_message_add_custom_header (&request, "RealChallenge2", value);
+        g_free (value);
+      }
+
       if (!gst_rtspsrc_send (src, &request, &response, NULL))
         goto send_error;
 
Index: rtspconnection.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/rtspconnection.c,v
retrieving revision 1.13
diff -u -3 -p -b -B -d -r1.13 rtspconnection.c
--- rtspconnection.c	10 Jul 2006 16:41:57 -0000	1.13
+++ rtspconnection.c	16 Jul 2006 19:36:09 -0000
@@ -150,6 +150,13 @@ append_header (gint key, gchar * value, 
   g_string_append_printf (str, "%s: %s\r\n", keystr, value);
 }
 
+static void
+append_custom_header (gpointer key, gpointer value, gpointer data)
+{
+  g_string_append_printf ((GString *) data, "%s: %s\r\n", (gchar *) key,
+      (gchar *) value);
+}
+
 RTSPResult
 rtsp_connection_send (RTSPConnection * conn, RTSPMessage * message)
 {
@@ -186,6 +193,7 @@ rtsp_connection_send (RTSPConnection * c
 
   /* append headers */
   g_hash_table_foreach (message->hdr_fields, (GHFunc) append_header, str);
+  g_hash_table_foreach (message->custom_hdr_fields, append_custom_header, str);
 
   /* append Content-Length and body if needed */
   if (message->body != NULL && message->body_size > 0) {
@@ -402,7 +410,8 @@ parse_line (gchar * buffer, RTSPMessage 
     while (g_ascii_isspace (*bptr))
       bptr++;
     rtsp_message_add_header (msg, field, bptr);
-  }
+  } else
+    rtsp_message_add_custom_header (msg, key, bptr);
 
   return RTSP_OK;
 }
Index: rtspmessage.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/rtspmessage.c,v
retrieving revision 1.4
diff -u -3 -p -b -B -d -r1.4 rtspmessage.c
--- rtspmessage.c	9 Feb 2006 14:20:14 -0000	1.4
+++ rtspmessage.c	16 Jul 2006 19:36:09 -0000
@@ -50,6 +50,11 @@ rtsp_message_init_request (RTSPMethod me
   msg->hdr_fields =
       g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
 
+  if (msg->custom_hdr_fields != NULL)
+    g_hash_table_destroy (msg->custom_hdr_fields);
+  msg->custom_hdr_fields =
+    g_hash_table_new (g_str_hash, g_str_equal);
+
   if (msg->body) {
     g_free (msg->body);
     msg->body = NULL;
@@ -92,6 +97,11 @@ rtsp_message_init_response (RTSPStatusCo
   msg->hdr_fields =
       g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
 
+  if (msg->custom_hdr_fields != NULL)
+    g_hash_table_destroy (msg->custom_hdr_fields);
+  msg->custom_hdr_fields =
+    g_hash_table_new (g_str_hash, g_str_equal);
+
   if (msg->body) {
     g_free (msg->body);
     msg->body = NULL;
@@ -139,7 +149,7 @@ rtsp_message_remove_header (RTSPMessage 
 
   g_hash_table_remove (msg->hdr_fields, GINT_TO_POINTER (field));
 
-  return RTSP_ENOTIMPL;
+  return RTSP_OK;
 }
 
 RTSPResult
@@ -161,6 +171,48 @@ rtsp_message_get_header (RTSPMessage * m
 }
 
 RTSPResult
+rtsp_message_add_custom_header (RTSPMessage * msg, const gchar * field,
+    const gchar * value)
+{
+  if (msg == NULL || field == NULL || value == NULL)
+    return RTSP_EINVAL;
+
+  g_hash_table_insert (msg->custom_hdr_fields, g_strdup (field),
+      g_strdup (value));
+
+  return RTSP_OK;
+}
+
+RTSPResult
+rtsp_message_remove_custom_header (RTSPMessage * msg, const gchar * field)
+{
+  if (msg == NULL || field == NULL)
+    return RTSP_EINVAL;
+
+  g_hash_table_remove (msg->custom_hdr_fields, field);
+
+  return RTSP_OK;
+}
+
+RTSPResult
+rtsp_message_get_custom_header (RTSPMessage * msg, const gchar * field,
+    const gchar ** value)
+{
+  gchar *val;
+
+  if (msg == NULL || field == NULL || value == NULL)
+    return RTSP_EINVAL;
+
+  val = g_hash_table_lookup (msg->custom_hdr_fields, field);
+  if (val == NULL)
+    return RTSP_ENOTIMPL;
+
+  *value = val;
+
+  return RTSP_OK;
+}
+
+RTSPResult
 rtsp_message_set_body (RTSPMessage * msg, guint8 * data, guint size)
 {
   if (msg == NULL)
@@ -236,6 +288,12 @@ dump_key_value (gpointer key, gpointer v
       (gchar *) value);
 }
 
+static void
+dump_custom_key_value (gpointer key, gpointer value, gpointer data)
+{
+  g_print ("   key: '%s', value: '%s'\n", (gchar *) key, (gchar *) value);
+}
+
 RTSPResult
 rtsp_message_dump (RTSPMessage * msg)
 {
@@ -253,6 +311,7 @@ rtsp_message_dump (RTSPMessage * msg)
     g_print ("   uri:    '%s'\n", msg->type_data.request.uri);
     g_print (" headers:\n");
     g_hash_table_foreach (msg->hdr_fields, dump_key_value, NULL);
+    g_hash_table_foreach (msg->custom_hdr_fields, dump_custom_key_value, NULL);
     g_print (" body:\n");
     rtsp_message_get_body (msg, &data, &size);
     dump_mem (data, size);
@@ -263,6 +322,7 @@ rtsp_message_dump (RTSPMessage * msg)
     g_print ("   reason: '%s'\n", msg->type_data.response.reason);
     g_print (" headers:\n");
     g_hash_table_foreach (msg->hdr_fields, dump_key_value, NULL);
+    g_hash_table_foreach (msg->custom_hdr_fields, dump_custom_key_value, NULL);
     rtsp_message_get_body (msg, &data, &size);
     g_print (" body: length %d\n", size);
     dump_mem (data, size);
Index: rtspmessage.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/rtspmessage.h,v
retrieving revision 1.4
diff -u -3 -p -b -B -d -r1.4 rtspmessage.h
--- rtspmessage.h	6 Dec 2005 19:44:55 -0000	1.4
+++ rtspmessage.h	16 Jul 2006 19:36:09 -0000
@@ -52,6 +52,7 @@ typedef struct _RTSPMessage
   } type_data;
 
   GHashTable    *hdr_fields;
+  GHashTable    *custom_hdr_fields;
 
   guint8        *body;
   guint          body_size;
@@ -74,6 +75,10 @@ RTSPResult      rtsp_message_add_header 
 RTSPResult      rtsp_message_remove_header      (RTSPMessage *msg, RTSPHeaderField field);
 RTSPResult      rtsp_message_get_header         (RTSPMessage *msg, RTSPHeaderField field, gchar **value);
 
+RTSPResult      rtsp_message_add_custom_header    (RTSPMessage *msg, const gchar *field, const gchar *value);
+RTSPResult      rtsp_message_remove_custom_header (RTSPMessage *msg, const gchar *field);
+RTSPResult      rtsp_message_get_custom_header    (RTSPMessage *msg, const gchar *field, const gchar **value);
+
 RTSPResult      rtsp_message_set_body           (RTSPMessage *msg, guint8 *data, guint size);
 RTSPResult      rtsp_message_take_body          (RTSPMessage *msg, guint8 *data, guint size);
 RTSPResult      rtsp_message_get_body           (RTSPMessage *msg, guint8 **data, guint *size);
