stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

notify: substate and retry-after

Browse source
This commit is contained in:
Richard Aas 2011-12-16 17:33:02 +00:00
parent 59145608c6
commit eb955d3d82
3 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/re_sipevent.h
View file

@ -65,10 +65,12 @@ int sipevent_accept(struct sipnot **notp, struct sipevent_sock *sock,
const char *cuser, const char *ctype,
sip_auth_h *authh, void *aarg, bool aref,
sipevent_close_h *closeh, void *arg, const char *fmt, ...);
int sipevent_notify(struct sipnot *not, struct mbuf *mb, bool term,
enum sipevent_reason reason);
int sipevent_notifyf(struct sipnot *not, struct mbuf **mbp, bool term,
enum sipevent_reason reason, const char *fmt, ...);
int sipevent_notify(struct sipnot *not, struct mbuf *mb,
enum sipevent_subst state, enum sipevent_reason reason,
uint32_t retry_after);
int sipevent_notifyf(struct sipnot *not, struct mbuf **mbp,
enum sipevent_subst state, enum sipevent_reason reason,
uint32_t retry_after, const char *fmt, ...);
/* Subscriber */

50
src/sipevent/notify.c
View file

@ -206,19 +206,28 @@ static int print_event(struct re_printf *pf, const struct sipnot *not)
static int print_substate(struct re_printf *pf, const struct sipnot *not)
{
int err;
if (not->terminated) {
return re_hprintf(pf, "terminated;reason=%s",
sipevent_reason_name(not->reason));
err = re_hprintf(pf, "terminated;reason=%s",
sipevent_reason_name(not->reason));
if (not->retry_after)
err |= re_hprintf(pf, ";retry-after=%u",
not->retry_after);
}
else {
uint32_t expires;
expires = (uint32_t)(tmr_get_expire(&not->tmr) / 1000);
return re_hprintf(pf, "%s;expires=%u",
not->mb ? "active" : "pending",
expires);
err = re_hprintf(pf, "%s;expires=%u",
sipevent_substate_name(not->substate),
expires);
}
return err;
}
@ -409,29 +418,40 @@ int sipevent_accept(struct sipnot **notp, struct sipevent_sock *sock,
}
int sipevent_notify(struct sipnot *not, struct mbuf *mb, bool term,
enum sipevent_reason reason)
int sipevent_notify(struct sipnot *not, struct mbuf *mb,
enum sipevent_subst state, enum sipevent_reason reason,
uint32_t retry_after)
{
if (!not || not->terminated)
return EINVAL;
if (mb || !term) {
if (mb || state != SIPEVENT_TERMINATED) {
mem_deref(not->mb);
not->mb = mem_ref(mb);
}
if (term) {
switch (state) {
case SIPEVENT_ACTIVE:
case SIPEVENT_PENDING:
not->substate = state;
return sipnot_notify(not);
case SIPEVENT_TERMINATED:
tmr_cancel(&not->tmr);
not->retry_after = retry_after;
(void)terminate(not, reason);
return 0;
}
return sipnot_notify(not);
default:
return EINVAL;
}
}
int sipevent_notifyf(struct sipnot *not, struct mbuf **mbp, bool term,
enum sipevent_reason reason, const char *fmt, ...)
int sipevent_notifyf(struct sipnot *not, struct mbuf **mbp,
enum sipevent_subst state, enum sipevent_reason reason,
uint32_t retry_after, const char *fmt, ...)
{
struct mbuf *mb;
va_list ap;
@ -441,7 +461,7 @@ int sipevent_notifyf(struct sipnot *not, struct mbuf **mbp, bool term,
return EINVAL;
if (mbp && *mbp)
return sipevent_notify(not, *mbp, term, reason);
return sipevent_notify(not, *mbp, state, reason, retry_after);
mb = mbuf_alloc(1024);
if (!mb)
@ -455,7 +475,7 @@ int sipevent_notifyf(struct sipnot *not, struct mbuf **mbp, bool term,
mb->pos = 0;
err = sipevent_notify(not, mb, term, reason);
err = sipevent_notify(not, mb, state, reason, retry_after);
if (err)
goto out;

2
src/sipevent/sipevent.h
View file

@ -38,6 +38,8 @@ struct sipnot {
uint32_t expires_min;
uint32_t expires_dfl;
uint32_t expires_max;
uint32_t retry_after;
enum sipevent_subst substate;
enum sipevent_reason reason;
bool notify_pending;
bool subscribed;