diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2005-08-07 06:22:38 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2005-08-07 06:22:38 +0000 |
| commit | 76823d4777869743af04038d82705cd7249657b8 (patch) | |
| tree | 29f432461e807792a267664ce1023da66c0181cb | |
| parent | ddefb55b4fec8598ce8ec0bc78e8321030269f59 (diff) | |
Use device specific service record register function
| -rw-r--r-- | dund/dund.h | 2 | ||||
| -rw-r--r-- | dund/main.c | 2 | ||||
| -rw-r--r-- | dund/sdp.c | 4 | ||||
| -rw-r--r-- | pand/main.c | 2 | ||||
| -rw-r--r-- | pand/pand.h | 2 | ||||
| -rw-r--r-- | pand/sdp.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/dund/dund.h b/dund/dund.h index 92626310..97c54174 100644 --- a/dund/dund.h +++ b/dund/dund.h @@ -45,6 +45,6 @@ int dun_kill_all_connections(void); int dun_open_connection(int sk, char *pppd, char **pppd_opts, int wait); /* SDP functions */ -int dun_sdp_register(uint8_t channel, int mrouter); +int dun_sdp_register(bdaddr_t *device, uint8_t channel, int mrouter); void dun_sdp_unregister(void); int dun_sdp_search(bdaddr_t *src, bdaddr_t *dst, int *channel, int mrouter); diff --git a/dund/main.c b/dund/main.c index ca841aeb..b00ccab7 100644 --- a/dund/main.c +++ b/dund/main.c @@ -122,7 +122,7 @@ static int do_listen(void) channel = DUN_DEFAULT_CHANNEL; if (use_sdp) - dun_sdp_register(channel, mrouter); + dun_sdp_register(&src_addr, channel, mrouter); if (mrouter) syslog(LOG_INFO, "Waiting for mRouter callback on channel %d", channel); @@ -56,7 +56,7 @@ void dun_sdp_unregister(void) sdp_close(session); } -int dun_sdp_register(uint8_t channel, int mrouter) +int dun_sdp_register(bdaddr_t *device, uint8_t channel, int mrouter) { sdp_list_t *svclass, *pfseq, *apseq, *root, *aproto; uuid_t root_uuid, l2cap, rfcomm, dun; @@ -104,7 +104,7 @@ int dun_sdp_register(uint8_t channel, int mrouter) sdp_set_info_attr(record, mrouter ? "mRouter" : "LAN Access Point", NULL, NULL); - status = sdp_record_register(session, record, 0); + status = sdp_device_record_register(session, device, record, 0); if (status) { syslog(LOG_ERR, "SDP registration failed."); sdp_record_free(record); record = NULL; diff --git a/pand/main.c b/pand/main.c index 72e607a9..b5a4ee95 100644 --- a/pand/main.c +++ b/pand/main.c @@ -131,7 +131,7 @@ static int do_listen(void) int sk, lm; if (use_sdp) - bnep_sdp_register(role); + bnep_sdp_register(&src_addr, role); /* Create L2CAP socket and bind it to PSM BNEP */ sk = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP); diff --git a/pand/pand.h b/pand/pand.h index b0052676..2981168b 100644 --- a/pand/pand.h +++ b/pand/pand.h @@ -46,6 +46,6 @@ int bnep_accept_connection(int sk, uint16_t role, char *dev); int bnep_create_connection(int sk, uint16_t role, uint16_t svc, char *dev); /* SDP functions */ -int bnep_sdp_register(uint16_t role); +int bnep_sdp_register(bdaddr_t *device, uint16_t role); void bnep_sdp_unregister(void); int bnep_sdp_search(bdaddr_t *src, bdaddr_t *dst, uint16_t service); @@ -58,7 +58,7 @@ void bnep_sdp_unregister(void) sdp_close(session); } -int bnep_sdp_register(uint16_t role) +int bnep_sdp_register(bdaddr_t *device, uint16_t role) { sdp_list_t *svclass, *pfseq, *apseq, *root, *aproto; uuid_t root_uuid, pan, l2cap, bnep; @@ -173,7 +173,7 @@ int bnep_sdp_register(uint16_t role) break; } - status = sdp_record_register(session, record, 0); + status = sdp_device_record_register(session, device, record, 0); if (status) { syslog(LOG_ERR, "SDP registration failed."); sdp_record_free(record); record = NULL; |