remove unused code

This commit is contained in:
c0ntrol
2019-07-08 20:45:17 +02:00
parent 48d51b8021
commit 41fd87425c

View File

@@ -732,84 +732,6 @@ static void _vj_server_empty_queue(vj_server *vje, int link_id)
}
#define _vj_malfunction(msg,content,buflen, index)\
{ \
if(msg != NULL)\
veejay_msg(VEEJAY_MSG_DEBUG,"%s",msg);\
veejay_msg(VEEJAY_MSG_DEBUG,"Message content");\
veejay_msg(VEEJAY_MSG_DEBUG,"msg [%s] (%d bytes) at position %d",\
content, buflen, index);\
int _foobar;\
for ( _foobar = 0; _foobar < (index+4); _foobar++);\
veejay_msg(VEEJAY_MSG_PRINT, " ");\
veejay_msg(VEEJAY_MSG_PRINT, "^");\
veejay_msg(VEEJAY_MSG_DEBUG, "VIMS (v) - dropped message");\
}
static int _vj_verify_msg(vj_server *vje,int link_id, char *buf, int buf_len )
{
int i = 0;
char *s = buf;
int num_msg = 0;
if( buf_len < 5 )
{
_vj_malfunction("VIMS (v) Message too small", buf, buf_len, i );
return 0;
}
while( i < buf_len )
{
if( s[i] == 'V' )
{
char *str_ptr = &s[(i+1)];
int netid = 0;
int slen = 0;
if( sscanf( str_ptr, "%3dD%3d:", &slen, &netid ) != 2 ) {
_vj_malfunction( "VIMS (v) invalid VIMS message", buf,buf_len, i );
return 0;
}
if( netid < 0 || netid > 600 ) {
_vj_malfunction( "VIMS (v) invalid VIMS command",buf,buf_len,i);
return 0;
}
str_ptr += 4;
i += 4;
if( vje->use_mcast )
{
if( netid >= 400 && netid < 500 )
{
_vj_malfunction( "VIMS (v) multicast doesnt allow querying of data",buf,buf_len,i);
return 0;
}
}
int failed = 1;
if( slen > 0 && str_ptr[slen-1] == ';' )
failed = 0;
i += (slen + 1);
num_msg ++;
if(failed)
{
_vj_malfunction("VIMS (v) message does not end with ';'", buf, buf_len , i);
return 0;
}
}
else {
_vj_malfunction( "VIMS (v) Cannot identify message as VIMS message", buf, buf_len, i);
return 0;
}
}
return num_msg;
}
void vj_server_init_msg_pool(vj_server *vje, int link_id )
{
vj_link **Link = (vj_link**) vje->link;
@@ -826,74 +748,6 @@ static void _vj_put_kf_msg(vj_server *vje, int link_id, char *buf, int buf_len,
v[num_msg]->msg = buf;
v[num_msg]->len = buf_len;
}
static void _vj_put_kf_msg_allocated(vj_server *vje, int link_id, char *buf, int buf_len, int num_msg)
{
vj_link **Link = (vj_link**) vje->link;
vj_message **v = Link[link_id]->m_queue;
v[num_msg]->msg = buf;
v[num_msg]->len = buf_len;
v[num_msg]->allocated = 1;
}
static int _vj_parse_msg(vj_server *vje,int link_id, char *buf, int buf_len, int num_msg )
{
int i = 0;
char *s = buf;
vj_link **Link = (vj_link**) vje->link;
vj_message **v = Link[link_id]->m_queue;
while( i < buf_len ) {
int slen = 0;
int netid = 0;
char *str_ptr = &s[i];
if(s[i] == 'V')
{
str_ptr ++; //@ [V][ ]
//@ ^
if( sscanf( str_ptr,"%3dD%3d", &slen, &netid ) != 2 ) {
veejay_msg(0, "Error parsing header in '%s' (%d bytes)", buf, buf_len );
return 0;
}
str_ptr += 4;
if(netid > 0 && netid <= 600) {
v[num_msg]->msg = vj_simple_pool_alloc( Link[link_id]->pool, slen + 1 );
if( v[num_msg]->msg ) {
//v[num_msg]->msg = strndup( str_ptr, slen ); //@ '600:;'
veejay_memcpy( v[num_msg]->msg, str_ptr, slen );
v[num_msg]->len = slen; //@ 5
v[num_msg]->msg[ slen ] = '\0';
num_msg++;
}
}
if(num_msg >= VJ_MAX_PENDING_MSG )
{
veejay_msg(VEEJAY_MSG_ERROR, "VIMS server queue full - got %d/%d messages",
num_msg,VJ_MAX_PENDING_MSG );
return VJ_MAX_PENDING_MSG; // cant take more
}
i += ( 5 + slen);
}
else {
veejay_msg(0, "VIMS: Expected token not a VIMS message or KF packet (at [%s] #%d of %d)", s + i,i,buf_len );
return 0;
}
}
Link[link_id]->n_queued = num_msg;
Link[link_id]->n_retrieved = 0;
return num_msg;
}
int vj_server_new_connection(vj_server *vje)
{