diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2010-11-30 23:03:13 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2010-11-30 23:03:13 +0300 |
| commit | 5927a85ef17d95bed836859fc3842cbbd78a1917 (patch) | |
| tree | 1d40d679015f10a5bafd42040798b2f2b32051ff /accel-pptpd | |
| parent | 2f29e750be84ffc69d2063d7e8e2224927f8af4f (diff) | |
| download | accel-ppp-xebd-5927a85ef17d95bed836859fc3842cbbd78a1917.tar.gz accel-ppp-xebd-5927a85ef17d95bed836859fc3842cbbd78a1917.zip | |
ppp: use atomic increment as session generation procedure
radius: DM/CoA: skip unauthorized sessions in session search procedure
Diffstat (limited to 'accel-pptpd')
| -rw-r--r-- | accel-pptpd/ppp/ppp.c | 14 | ||||
| -rw-r--r-- | accel-pptpd/radius/radius.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/accel-pptpd/ppp/ppp.c b/accel-pptpd/ppp/ppp.c index 84f47f2..79c2d2b 100644 --- a/accel-pptpd/ppp/ppp.c +++ b/accel-pptpd/ppp/ppp.c @@ -30,8 +30,7 @@ __export LIST_HEAD(ppp_list); static LIST_HEAD(layers); int __export sock_fd; -static spinlock_t seq_lock = SPINLOCK_INITIALIZER; -static uint64_t seq; +static unsigned long long seq; struct ppp_stat_t ppp_stat; @@ -70,10 +69,7 @@ static void generate_sessionid(struct ppp_t *ppp) { unsigned long long sid; - spin_lock(&seq_lock); - seq++; - sid = seq; - spin_unlock(&seq_lock); + sid = __sync_add_and_fetch(&seq, 1); sprintf(ppp->sessionid, "%016llx", sid); } @@ -589,14 +585,13 @@ struct ppp_layer_data_t *ppp_find_layer_data(struct ppp_t *ppp, struct ppp_layer static void save_seq(void) { FILE *f; - unsigned long long sid = seq; char *opt = conf_get_opt("ppp", "seq-file"); if (!opt) opt = "/var/run/accel-pptp/seq"; f = fopen(opt, "w"); if (f) { - fprintf(f, "%llu", sid); + fprintf(f, "%llu", seq); fclose(f); } } @@ -605,7 +600,6 @@ static void __init init(void) { char *opt; FILE *f; - unsigned long long sid; sock_fd = socket(AF_INET, SOCK_DGRAM, 0); if (sock_fd < 0) { @@ -623,7 +617,7 @@ static void __init init(void) f = fopen(opt, "r"); if (f) { - fscanf(f, "%llu", &sid); + fscanf(f, "%llu", &seq); seq = sid; fclose(f); } else diff --git a/accel-pptpd/radius/radius.c b/accel-pptpd/radius/radius.c index eff1e34..11b2717 100644 --- a/accel-pptpd/radius/radius.c +++ b/accel-pptpd/radius/radius.c @@ -254,6 +254,8 @@ struct radius_pd_t *rad_find_session(const char *sessionid, const char *username pthread_rwlock_rdlock(&sessions_lock); list_for_each_entry(rpd, &sessions, entry) { + if (!rpd->ppp->username) + continue; if (sessionid && strcmp(sessionid, rpd->ppp->sessionid)) continue; if (username && strcmp(username, rpd->ppp->username)) |