diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-07-23 19:21:02 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-07-23 19:21:02 +0200 |
| commit | 761e944182255225bd2d48caa7d66a28ec7dea65 (patch) | |
| tree | cc2ed755d1957f1d296ae0940aeadaef612dc6a8 /openbsc/include | |
| parent | b3c3faee940cda77afa9ba2500afa9ae9919851e (diff) | |
make sure subscr->net is always set
since a subscriber is an element of the gsm_network, we have to ensure
subscr->net is always set correctly. We do this by using gsm_network
as an argument to all functions that resolve or create a subscriber.
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/db.h | 9 | ||||
| -rw-r--r-- | openbsc/include/openbsc/gsm_subscriber.h | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 61a3ac47c..c9b72659e 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -31,14 +31,17 @@ int db_prepare(); int db_fini(); /* subscriber management */ -struct gsm_subscriber* db_create_subscriber(char *imsi); -struct gsm_subscriber* db_get_subscriber(enum gsm_subscriber_field field, const char *subscr); +struct gsm_subscriber* db_create_subscriber(struct gsm_network *net, + char *imsi); +struct gsm_subscriber* db_get_subscriber(struct gsm_network *net, + enum gsm_subscriber_field field, + const char *subscr); int db_sync_subscriber(struct gsm_subscriber* subscriber); int db_subscriber_alloc_tmsi(struct gsm_subscriber* subscriber); int db_subscriber_assoc_imei(struct gsm_subscriber* subscriber, char *imei); /* SMS store-and-forward */ int db_sms_store(struct gsm_sms *sms); -struct gsm_sms *db_sms_get_unsent(int min_id); +struct gsm_sms *db_sms_get_unsent(struct gsm_network *net, int min_id); int db_sms_mark_sent(struct gsm_sms *sms); #endif /* _DB_H */ diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 4a2311555..00eeb3287 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -60,9 +60,12 @@ enum gsm_subscriber_update_reason { struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr); -struct gsm_subscriber *subscr_get_by_tmsi(const char *tmsi); -struct gsm_subscriber *subscr_get_by_imsi(const char *imsi); -struct gsm_subscriber *subscr_get_by_extension(const char *ext); +struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_network *net, + const char *tmsi); +struct gsm_subscriber *subscr_get_by_imsi(struct gsm_network *net, + const char *imsi); +struct gsm_subscriber *subscr_get_by_extension(struct gsm_network *net, + const char *ext); int subscr_update(struct gsm_subscriber *s, struct gsm_bts *bts, int reason); void subscr_put_channel(struct gsm_lchan *lchan); void subscr_get_channel(struct gsm_subscriber *subscr, |