diff -ru baselib.orig/oh_client.cpp baselib/oh_client.cpp --- baselib.orig/oh_client.cpp 2010-07-23 11:05:30.000000000 +0200 +++ baselib/oh_client.cpp 2010-07-23 11:13:18.000000000 +0200 @@ -1,6 +1,7 @@ /* -*- linux-c -*- * * (C) Copyright IBM Corp. 2004-2008 + * (C) Copyright Nokia Siemens Networks 2010 * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,6 +14,11 @@ * W. David Ashley * Renier Morales * Anton Pak + * Ulrich Kleber + * + * Log: + * 07-22-2010 ulikleber: Added support for drt in default domain + * * */ @@ -400,6 +406,14 @@ return SA_ERR_HPI_INVALID_PARAMS; } + /* in case of default domain, read the default drt with information */ + /* from openhpiclient.conf. Otherwise contact the daemon. */ + /* Note: There is no difference between domain id 0 (default in */ + /* openhpiclient.conf or host/port in environment variables */ + /* and SAHPI_UNSPECIFIED_DOMAIN_ID. */ + if (did==OH_DEFAULT_DOMAIN_ID) + return oh_default_drt_entry_get (EntryId, NextEntryId, DrtEntry); + cHpiMarshal *hm = HpiMarshalFind(eFsaHpiDrtEntryGet); pinst->MessageHeaderInit(eMhMsg, 0, eFsaHpiDrtEntryGet, hm->m_request_len); request = malloc(hm->m_request_len); diff -ru baselib.orig/oh_client_session.cpp baselib/oh_client_session.cpp --- baselib.orig/oh_client_session.cpp 2010-07-23 11:05:30.000000000 +0200 +++ baselib/oh_client_session.cpp 2010-07-23 11:16:29.000000000 +0200 @@ -1,6 +1,7 @@ /* -*- linux-c -*- * * (C) Copyright IBM Corp. 2004-2008 + * (C) Copyright Nokia Siemens Networks 2010 * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,6 +13,10 @@ * Author(s): * W. David Ashley * Renier Morales + * Ulrich Kleber + * + * Log: + * 07-22-2010 ulikleber: Added support for drt in default domain * */ @@ -28,6 +33,43 @@ GHashTable *ohd_sessions = NULL; GStaticRecMutex ohd_sessions_sem = G_STATIC_REC_MUTEX_INIT; static SaHpiSessionIdT next_client_sid = 1; +static oh_domain *default_domain = g_new0(struct oh_domain, 1); + +static void init_default_domain () +{ + // only used for drt, but all fields should be initialized + default_domain->id = SAHPI_UNSPECIFIED_DOMAIN_ID; + oh_init_textbuffer(&default_domain->tag); + oh_append_textbuffer(&default_domain->tag, "Default"); + default_domain->ai_timeout = SAHPI_TIME_UNSPECIFIED; + default_domain->capabilities = SAHPI_DOMAIN_CAP_AUTOINSERT_READ_ONLY; + memset(&default_domain->guid, 0, sizeof(SaHpiGuidT)); + oh_init_rpt(&default_domain->rpt); + default_domain->dat.next_id = 0; + default_domain->dat.list = NULL; + default_domain->dat.update_count = 0; + default_domain->dat.update_timestamp = SAHPI_TIME_UNSPECIFIED; + default_domain->dat.overflow = SAHPI_FALSE; + default_domain->del = oh_el_create (0); + default_domain->drt.parent_id = SAHPI_UNSPECIFIED_DOMAIN_ID; + default_domain->drt.next_id = 0; + default_domain->drt.list = NULL; + default_domain->drt.update_count = 0; + default_domain->drt.update_timestamp = SAHPI_TIME_UNSPECIFIED; +} + +/* Function to add domains from ohd_domains to drt */ +static void __adddrt(gpointer key, gpointer value, gpointer user_data) +{ + oh_domain_conf *domconf = (struct oh_domain_conf *)value; + oh_domain *default_domain = (struct oh_domain *) user_data; + SaHpiDrtEntryT *drtentry = g_new0(SaHpiDrtEntryT, 1); + + drtentry->EntryId = ++default_domain->drt.next_id; + drtentry->DomainId = domconf->did; + drtentry->IsPeer = SAHPI_FALSE; // No peers for Default domain. + default_domain->drt.list = g_slist_append (default_domain->drt.list, drtentry); +} static void __destroy_client_connx(gpointer data) { @@ -100,6 +142,11 @@ g_hash_table_insert(ohd_domains, &domain_conf->did, domain_conf); } + + /* Create drt for default domain and fill with client config */ + init_default_domain (); + g_hash_table_foreach (ohd_domains, __adddrt, default_domain); + } g_static_rec_mutex_unlock(&ohd_sessions_sem); @@ -278,3 +325,30 @@ g_static_rec_mutex_unlock(&ohd_sessions_sem); return SA_OK; } + +/* DrtEntryGet for Default Domain (no DRT but get entry from configured domains */ +SaErrorT oh_default_drt_entry_get ( + SaHpiEntryIdT entryid, + SaHpiEntryIdT *nextentryid, + SaHpiDrtEntryT *drtentry) +{ + GSList *drtnode = NULL; + + // copied from domain.c + for (drtnode = default_domain->drt.list; drtnode; drtnode = drtnode->next) { + SaHpiDrtEntryT *curdrt = (SaHpiDrtEntryT *)drtnode->data; + if (curdrt->EntryId == entryid || entryid == SAHPI_FIRST_ENTRY) { + if (drtnode->next == NULL) { /* last entry */ + *nextentryid = SAHPI_LAST_ENTRY; + } else { + SaHpiDrtEntryT *nextdrt = + (SaHpiDrtEntryT *)drtnode->next->data; + *nextentryid = nextdrt->EntryId; + } + memcpy(drtentry, curdrt, sizeof(SaHpiDrtEntryT)); + return SA_OK; + } + } + return SA_ERR_HPI_INTERNAL_ERROR; +} + diff -ru baselib.orig/oh_client_session.h baselib/oh_client_session.h --- baselib.orig/oh_client_session.h 2010-07-23 11:05:30.000000000 +0200 +++ baselib/oh_client_session.h 2010-07-23 11:17:51.000000000 +0200 @@ -1,6 +1,7 @@ /* -*- linux-c -*- * * (C) Copyright IBM Corp. 2004-2008 + * (C) Copyright Nokia Siemens Networks 2010 * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,6 +13,10 @@ * Author(s): * W. David Ashley * Renier Morales + * Ulrich Kleber + * + * Log: + * 07-22-2010 ulikleber: Added support for drt in default domain * */ @@ -45,6 +50,7 @@ SaHpiSessionIdT oh_open_session(SaHpiDomainIdT, SaHpiSessionIdT, pcstrmsock); SaErrorT oh_close_session(SaHpiSessionIdT); +SaErrorT oh_default_drt_entry_get (SaHpiEntryIdT,SaHpiEntryIdT *,SaHpiDrtEntryT *); #ifdef __cplusplus } /* extern "C" */