Browse Source

remove obsolete HAS_HANDLER flag

pull/81/head
Richard Fuchs 11 years ago
parent
commit
1f7c8a228a
2 changed files with 4 additions and 6 deletions
  1. +3
    -5
      daemon/call.c
  2. +1
    -1
      daemon/call.h

+ 3
- 5
daemon/call.c View File

@ -551,7 +551,7 @@ static void determine_handler(struct packet_stream *in, const struct packet_stre
const struct streamhandler **sh_pp, *sh;
const struct streamhandler ***matrix;
if (PS_ISSET(in, HAS_HANDLER))
if (in->handler)
return;
if (MEDIA_ISSET(in->media, PASSTHRU))
goto noop;
@ -573,15 +573,13 @@ static void determine_handler(struct packet_stream *in, const struct packet_stre
goto err;
in->handler = sh;
done:
PS_SET(in, HAS_HANDLER);
return;
err:
ilog(LOG_WARNING, "Unknown transport protocol encountered");
noop:
in->handler = &__sh_noop;
goto done;
return;
}
void stream_msg_mh_src(struct packet_stream *ps, struct msghdr *mh) {
@ -3088,7 +3086,7 @@ void __monologue_tag(struct call_monologue *ml, const str *tag) {
static void __stream_unkernelize(struct packet_stream *ps) {
unkernelize(ps);
PS_CLEAR(ps, CONFIRMED);
PS_CLEAR(ps, HAS_HANDLER);
ps->handler = NULL;
}
static void stream_unkernelize(struct packet_stream *ps) {
if (!ps)


+ 1
- 1
daemon/call.h View File

@ -130,7 +130,7 @@ struct call_monologue;
#define PS_FLAG_CONFIRMED 0x00200000
#define PS_FLAG_KERNELIZED 0x00400000
#define PS_FLAG_NO_KERNEL_SUPPORT 0x00800000
#define PS_FLAG_HAS_HANDLER 0x01000000
#define PS_FLAG_UNUSED 0x01000000
#define PS_FLAG_FINGERPRINT_VERIFIED 0x02000000
#define PS_FLAG_STRICT_SOURCE SHARED_FLAG_STRICT_SOURCE
#define PS_FLAG_MEDIA_HANDOVER SHARED_FLAG_MEDIA_HANDOVER


Loading…
Cancel
Save