comparison libmpdemux/realrtsp/rtsp_session.c @ 12266:096072d234c6

Some sanity and bound checking

12265:c9e1fe032d10

#include "rtsp.h"
#include "rtsp_session.h"
#include "real.h"
#include "rmff.h"
#include "asmrp.h"

/*
#define LOG
*/

struct rtsp_session_s {

  rtsp_t       *s;

  /* receive buffer */
  uint8_t       recv[BUF_SIZE];
  int           recv_size;
  int           recv_read;

  /* header buffer */
  uint8_t       header[HEADER_SIZE];

  char *server;
  char *mrl_line = NULL;
  rmff_header_t *h;
  uint32_t bandwidth=10485800;

//connect:
  *redir = 0;

  /* connect to server */
  rtsp_session->s=rtsp_connect(fd,*mrl,path,host,port,NULL);
  if (!rtsp_session->s)
  {
    printf("rtsp_session: failed to connect to server %s\n", path);
    free(rtsp_session);
    return NULL;
  }

  /* looking for server type */

//	goto connect; /* *shudder* i made a design mistake somewhere */
      } else
      {
        printf("rtsp_session: session can not be established.\n");
        rtsp_close(rtsp_session->s);
        free(rtsp_session);
        return NULL;
      }
    }
	
    rtsp_session->header_len=rmff_dump_header(h,rtsp_session->header,1024);

    memcpy(rtsp_session->recv, rtsp_session->header, rtsp_session->header_len);
    rtsp_session->recv_size = rtsp_session->header_len;
    rtsp_session->recv_read = 0;
    
  } else
  {
    printf("rtsp_session: Not a Real server. Server type is '%s'.\n",server);
    rtsp_close(rtsp_session->s);
    free(server);
    free(rtsp_session);
    return NULL;
  }
  free(server);
  

    
    memcpy(dest, source, fill);
    to_copy -= fill;
    dest += fill;
    this->recv_read = 0;
    source = this->recv;
    this->recv_size = real_get_rdt_chunk (this->s, source);
    fill = this->recv_size;

    if (this->recv_size == 0) {
#ifdef LOG
      printf ("librtsp: %d of %d bytes provided\n", len-to_copy, len);

}

void rtsp_session_end(rtsp_session_t *session) {

  rtsp_close(session->s);
  free(session);
}

12266:096072d234c6

#include "rtsp.h"
#include "rtsp_session.h"
#include "real.h"
#include "rmff.h"
#include "asmrp.h"
#include "xbuffer.h"

/*
#define LOG
*/

struct rtsp_session_s {

  rtsp_t       *s;

  /* receive buffer */
  uint8_t       *recv;
  int           recv_size;
  int           recv_read;

  /* header buffer */
  uint8_t       header[HEADER_SIZE];

  char *server;
  char *mrl_line = NULL;
  rmff_header_t *h;
  uint32_t bandwidth=10485800;

  rtsp_session->recv = xbuffer_init(BUF_SIZE);

//connect:
  *redir = 0;

  /* connect to server */
  rtsp_session->s=rtsp_connect(fd,*mrl,path,host,port,NULL);
  if (!rtsp_session->s)
  {
    printf("rtsp_session: failed to connect to server %s\n", path);
    rtsp_session->recv = xbuffer_free(rtsp_session->recv);
    free(rtsp_session);
    return NULL;
  }

  /* looking for server type */

//	goto connect; /* *shudder* i made a design mistake somewhere */
      } else
      {
        printf("rtsp_session: session can not be established.\n");
        rtsp_close(rtsp_session->s);
        rtsp_session->recv = xbuffer_free(rtsp_session->recv);
        free(rtsp_session);
        return NULL;
      }
    }
	
    rtsp_session->header_len=rmff_dump_header(h,rtsp_session->header,1024);

    rtsp_session->recv = xbuffer_copyin(rtsp_session->recv, 0, rtsp_session->header, rtsp_session->header_len);
    rtsp_session->recv_size = rtsp_session->header_len;
    rtsp_session->recv_read = 0;
    
  } else
  {
    printf("rtsp_session: Not a Real server. Server type is '%s'.\n",server);
    rtsp_close(rtsp_session->s);
    free(server);
    rtsp_session->recv = xbuffer_free(rtsp_session->recv);
    free(rtsp_session);
    return NULL;
  }
  free(server);
  

    
    memcpy(dest, source, fill);
    to_copy -= fill;
    dest += fill;
    this->recv_read = 0;
    this->recv_size = real_get_rdt_chunk (this->s, &(this->recv));
    source = this->recv;
    fill = this->recv_size;

    if (this->recv_size == 0) {
#ifdef LOG
      printf ("librtsp: %d of %d bytes provided\n", len-to_copy, len);

}

void rtsp_session_end(rtsp_session_t *session) {

  rtsp_close(session->s);
  session->recv = xbuffer_free(session->recv);
  free(session);
}