mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
b564bd67d3
- Use CompositorWidgetProxy for dispatching vsync to the compositor. (bug 1269037 part 1, r=mchang) (c8b7a4240c) - Remove unused null widget checks. (bug 1269037 part 2, r=mchang) (4f4cc9952b) - Bug 1269422: Wrap Gonk widget in |CompositorWidgetProxyWrapper|. r=dvander (4513035cbf) - Remove nsBaseWidget::NewCompositorBridgeParent. (bug 1272472 part 1, r=kats) (ca813c1f2b) - Use IPDL to schedule composites on GTK. (bug 1272472 part 2, r=nical) (7402cf834e) - Use IPC to schedule composites on Windows. (bug 1272472 part 3, r=jimm) (e5d7281dd7) - Don't use nsIWidget to check APZ in LayerManagerComposite. (bug 1269653 part 1, r=kats) (79a1644111) - Restrict SetDispAcquireFence's nsIWidget access to Gonk. (bug 1269653 part 2, r=kats) (72110b7bc7) - Bug 1264764 - Move PTexture under PCompositorBridge r=nical,dvander (17e6ec7fc1) - Move CompositorThreadHolder into its own file. (bug 1273017 part 1, r=mattwoodrow) (464ede8be1) - Move CompositorBridgeParent::CompositorLoop to CompositorThreadHolder. (bug 1273017 part 2, r=mattwoodrow) (85708f3cde) - Bug 1268313: Part 1 - Be explicit about which NewRunnableMethod callers want to be able to cancel. r=froydnj (faa07aa139) - Bug 1268313: Part 2 - Replace some NewRunnableMethods with NS_NewNonOwningRunnableMethod. r=froydnj (010c43d000) - Bug 1268313: Part 3 - Replace some NewCancelableRunnableMethod with NS_NewNonOwningCancelableRunnableMethod. r=froydnj (55018ef234) - Bug 1268313: Part 4 - Replace NewCancelableRunnableMethod with NS_NewCancelableRunnableMethod. r=froydnj (c22711b35d) - Bug 1268313: Part 5 - Make NS_NewRunnableMethod able to call const functions. r=froydnj (b0f60963a3) - Bug 1268313: Part 6 - Replace NewRunnableMethod with NS_NewRunnableMethod. r=froydnj (18d40def2c) - Bug 1260950 - Set mInitialSizeFound to true when the initial size id found. r=jesup, r=pehrsons a=kwierso (5d6abe57e0) - Bug 1237176 - Notify synth start if we get a finished event without a blocking-changed event. r=roc (c1aebe903a) - Bug 911546, use a runnable so that popups don't rollup during a grab, r=karlt (a06bd44e6c) - Bug 1237617 - Call nsWindow::ForcePresent during going active r=bas.schouten (066cad8f89) - Bug 1268313: Part 7 - Move NS_NewRunnableMethod and friends to mozilla::NewRunnableMethod. r=froydnj (8b4bf34961) - Bug 1266595: Followup to fix IPDL tests. r=billm (216f2dcff5) - Bug 1268313: Fix up IPDL tests. r=billm (228348d642) - Add WinCompositorWidgetProxy. (bug 1265975 part 1, r=jimm) (bfafe7a8e2) - Implement WinCompositorWidgetProxy::GetClientSize. (bug 1265975 part 2, r=jimm) (a8710a3259) - Move the WM_SETTEXT present lock to CompositorWidgetProxy. (bug 1265975 part 3, r=jimm) (297ce28c8a) - Move transparency handling to WinCompositorWigetProxy. (bug 1265975 part 4, r=jimm) (46ba0c6d01) - Remove Windows-specific compositor calls to nsIWidget. (bug 1265975 part 5, r=jimm) (3ef157c160) - Remove plugin-related CompositorBridgeParent use of nsIWidget. (bug 1265975 part 6, r=jimm) (6d80cdd6fd) - Hide top-level CompositorBridgeParents behind a new API. (bug 1272472 part 4, r=mattwoodrow,kats,gwagner) (228c0efdb7) - Bug 1253424 - part 1 - add a already_AddRefed nsTransactionStack::Push overload; r=erahm (7059e20914) - Bug 1253424 - part 2 - add nsTransactionStack::IsEmpty; r=erahm (7e9764a146) - Bug 1254618 - modify nsTransactionStack to use nsDeque rather than std::deque; r=ehsan (5e47ea431e) - Bug 1136857 - Make DOMStorageCache::mLoaded flag atomic to prevent potential races, r=nfroyd (39aaea1de3) - Bug 1265408 - Add webidl for IIRFilterNode; r=smaug (040ce9aa43) - Bug 1265408 - Implement IIRFilterNode; r=padenot (6bf569a412) - Bug 1265408 - Import IIRFilter from blink; r=padenot (71b28c0ad2) - Bug 1265408 - Use IIRFilter from blink; r=padenot (5d058d8568) - Bug 1265408 - Add buffersAreZero to IIRFilter; r=karlt (45edba3e13) - Bug 1265408 - Avoid subnormals in IIRFilter; r=karlt (0e1ae93f0b) - Bug 1265408 - Add LogToDeveloperConsole to WebAudioUtils; r=padenot (88d5f0222a) - Bug 1268984 - Store GMPStorage on GMPServiceParent so that it persists inside the same PB session. r=gerald (17d4d0abaf) - Bug 1267905 - Replace uses of ScopedCERTCertList with UniqueCERTCertList. r=keeler (783bf11b2a) - Bug 1270005 - Replace uses of ScopedPK11SlotInfo with UniquePK11SlotInfo in PSM. r=keeler (ea9a4011aa) - Bug 1271501 - Remove unnecessary uses of reinterpret_cast in PSM. r=keeler (6be40f0a85) - Bug 1271501 - Downgrade unnecessarily strong reinterpret_casts in PSM. r=keeler (95245f00ce) - Bug 1082346 - 01. Convert PKCS12 password endian using copyAndSwapToBigEndian. r=keeler (9cc58fc550) - Bug 1082346 - 02. Test case. r=keeler r=Cykesiopka (7fb0e8abc4) - Bug 160122 - Stop using PR_smprintf in PSM. r=keeler (1e5b68819c) - Bug 1271501 - Use mozilla::BitwiseCast instead of reinterpret_cast in PSM. r=keeler (894966a2ef) - Bug 1273855: TraceLogger - Include PID in the log names in order to support browser with e10s, r=bbouvier (8cf2233db3) - Bug 1274189. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (4511b3d3f7) - Bug 1274189. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (77e745fdd1) - Bug 1274189. Part 3 - remove use of FlushableTaskQueue. r=jya (aac61dcd02) - Bug 1269963. Part 1 - Add a SyncRunnable::DispatchToThread() overload for AbstractThread. r=bobbyholley. (839752aff4) - Bug 1269672 - part1 : revert sampling rate changing of the bug1235612. (9015782e13) - Bug 1270698 - check if we need to enter buffering periodically to ensure we start buffering when running out of decoded audio/video data. r=cpearce. (16734549b7) - Bug 1271581 - use newCurrentTime, instead of GetMediaTime() to decide the nextState; r=jwwang (9c5075eada) - Bug 1224973 - Part 1: Remove MediaDecoderOwner->IsHidden(). r=cpearce,jwwang (4fde3ede5a) - Bug 1224973 - Part 2: Set MediaDecoder visibility via NotifyOwnerActivityChanged. r=cpearce,jwwang (be917202eb) - Bug 1224973 - Part 3: Plumb element visibility into MDSM. r=jya,jwwang (9ec83fa243) - Bug 1224973 - Part 4: Pref media.suspend-bkgnd-video.enabled. r=cpearce,jwwang (43413a025f) - Bug 1269408: P1. Retry InternalSeek if previous attempt failed once more data is available. r=gerald (05db58dc7c) - crude fix (0097068989) - Bug 1269408: P2. Update mochitest. r=gerald (464b4c0724) - Bug 1269408: P3. Ensure a new seek request will cancel the previous internal seek. r=gerald (6ed4b8dc95) - Bug 1269408: P4. Ensure the decoders are flushed prior performing an internal seek. r=gerald (074234067b) - Bug 1269408: P5. Only drop the seek target if it's exactly the seek target. r=gerald (88701eb05a) - Bug 1269408: P6. Add debugging information, useful when a mochitest timeout. r=gerald (ef0270ab0d) - Bug 1269408: P7. Start skip to next keyframe logic when resume point is behind current time. r=gerald (bd40ebf3bc) - Bug 1269408: P8. Add debugging log. r=gerald (e6dbd1f0a6) - Bug 1269408: P9. Move handling logic of skip to next keyframe to its own function. r=gerald (3c8039e417) - Bug 1269408: P10. Reject promise early if in error state. r=me (8af54c574e) - Bug 1224973 - Part 5: Implement suspend decoding for background video. r=cpearce,jwwang,jya (22081521e3) - Bug 1242874 - part1 : create suspened types. r=baku (d3ac9548e5) - Bug 1242874 - part2 : window's suspend attribute. r=baku, r=ehsan (1fd9dc2647) - remove allowscirpted (39ab523036) - Bug 1242874 - part3 : implement different suspended methods. r=baku, r=jwwang (25d1f27a03) - Bug 1242874 - part4 : wrap the volume/mute/suspend for notifyStartedPlaying. r=baku (b8ba3238c2) - bug 1242874 - part5 : add test. r=baku, r=ehsan (f840139b5a) - Bug 1235612 - Part 1: Implement notify media-playback. r=baku (b5ec29da20) - Bug 1235612 - Part 2: Notify audible state in NotifyStartedPlaying. r=baku (dc38583a62) - Bug 1235612 - Part 3: Implement the logic of audible state notification for agent owners. r=baku (f65b3952fa) - Bug 1235612 - Part 4: Modify check audible method. r=jwwang (73457e39eb) - Bug 1269672 - part2 : move audible data checking from MDSM to DecodedAudioDataSink. (d2c3b6874c) - Bug 1269936 - Introduce and call a runtime-wide servo initialization hook. r=heycam (d4d505d4c2) - Bug 1263778 - Rename a bunch of low-level [[Prototype]] access methods to make their interactions with statically-known and dynamically-computed [[Prototype]]s clearer. r=efaust (66bbe8e7db) - Bug 888969 - Permit a cyclic [[Prototype]] chain to be created through a Location object. r=bz, r=efaust (3e3b9cbb16) - re-apply Bug 1054906 - Implement ES6 Symbol.hasInstance 2/2; r=jandem (8d5c7573ff) - Bug 1054906 - Implement ES6 Symbol.hasInstance 1/2; r=evilpie,bz (a836904e5d) - fix misspatch (54a5f2d708) - Bug 1270349 part 1. Add IDL parser support for [LegacyUnenumerableNamedProperties]. r=peterv (8c836bc74a) - Bug 1270349 part 2. Add [LegacyUnenumerableNamedProperties] to the interfaces that specify it in DOM and HTML. r=peterv (25d3cc1377) - Bug 1270349 part 3. Add a way to ask an interface descriptor for a proxy whether its named props should be enumerable. r=peterv (0a9f804867) - Bug 1270349 part 4. Use LegacyUnenumerableNamedProperties instead of NameIsEnumerable() calls to determine whether named props on DOM proxies should be enumerable. r=peterv (82f5158963) - Bug 1270349 part 5. Use LegacyUnenumerableNamedProperties instead of passing flags to GetSupportedNames to determine whether named props on DOM proxies should be reflected in ownPropertyKeys. r=peterv (3984176834) - Bug 1270349 followup to address a review comment. r=peterv (b49f4c5335)
397 lines
11 KiB
C++
397 lines
11 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsSmartCardMonitor.h"
|
|
|
|
#include "ScopedNSSTypes.h"
|
|
#include "mozilla/Services.h"
|
|
#include "mozilla/unused.h"
|
|
#include "nsIObserverService.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nspr.h"
|
|
#include "pk11func.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
//
|
|
// The SmartCard monitoring thread should start up for each module we load
|
|
// that has removable tokens. This code calls an NSS function which waits
|
|
// until there is a change in the token state. NSS uses the
|
|
// C_WaitForSlotEvent() call in PKCS #11 if the module implements the call,
|
|
// otherwise NSS will poll the token in a loop with a delay of 'latency'
|
|
// between polls. Note that the C_WaitForSlotEvent() may wake up on any type
|
|
// of token event, so it's necessary to filter these events down to just the
|
|
// insertion and removal events we are looking for.
|
|
//
|
|
// Once the event is found, it is dispatched to the main thread to notify
|
|
// any window where window.crypto.enableSmartCardEvents is true.
|
|
// Additionally, all observers of the topics "smartcard-insert" and
|
|
// "smartcard-remove" are notified by the observer service of the appropriate
|
|
// event.
|
|
//
|
|
|
|
class nsTokenEventRunnable : public nsIRunnable {
|
|
public:
|
|
nsTokenEventRunnable(const nsAString& aType, const nsAString& aTokenName)
|
|
: mType(aType)
|
|
, mTokenName(aTokenName)
|
|
{
|
|
}
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
private:
|
|
virtual ~nsTokenEventRunnable() {}
|
|
|
|
nsString mType;
|
|
nsString mTokenName;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(nsTokenEventRunnable, nsIRunnable)
|
|
|
|
NS_IMETHODIMP
|
|
nsTokenEventRunnable::Run()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
nsCOMPtr<nsIObserverService> observerService =
|
|
mozilla::services::GetObserverService();
|
|
if (!observerService) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
// This conversion is safe because mType can only be "smartcard-insert"
|
|
// or "smartcard-remove".
|
|
NS_ConvertUTF16toUTF8 eventTypeUTF8(mType);
|
|
return observerService->NotifyObservers(nullptr, eventTypeUTF8.get(),
|
|
mTokenName.get());
|
|
}
|
|
|
|
// self linking and removing double linked entry
|
|
// adopts the thread it is passed.
|
|
class SmartCardThreadEntry
|
|
{
|
|
public:
|
|
friend class SmartCardThreadList;
|
|
SmartCardThreadEntry(SmartCardMonitoringThread *thread,
|
|
SmartCardThreadEntry *next,
|
|
SmartCardThreadEntry *prev,
|
|
SmartCardThreadEntry **head)
|
|
: next(next)
|
|
, prev(prev)
|
|
, head(head)
|
|
, thread(thread)
|
|
{
|
|
if (prev) {
|
|
prev->next = this;
|
|
} else {
|
|
*head = this;
|
|
}
|
|
if (next) {
|
|
next->prev = this;
|
|
}
|
|
}
|
|
|
|
~SmartCardThreadEntry()
|
|
{
|
|
if (prev) {
|
|
prev->next = next;
|
|
} else {
|
|
*head = next;
|
|
}
|
|
if (next) {
|
|
next->prev = prev;
|
|
}
|
|
// NOTE: automatically stops the thread
|
|
delete thread;
|
|
}
|
|
|
|
private:
|
|
SmartCardThreadEntry *next;
|
|
SmartCardThreadEntry *prev;
|
|
SmartCardThreadEntry **head;
|
|
SmartCardMonitoringThread *thread;
|
|
};
|
|
|
|
//
|
|
// SmartCardThreadList is a class to help manage the running threads.
|
|
// That way new threads could be started and old ones terminated as we
|
|
// load and unload modules.
|
|
//
|
|
SmartCardThreadList::SmartCardThreadList() : head(0)
|
|
{
|
|
}
|
|
|
|
SmartCardThreadList::~SmartCardThreadList()
|
|
{
|
|
// the head is self linking and unlinking, the following
|
|
// loop removes all entries on the list.
|
|
// it will also stop the thread if it happens to be running
|
|
while (head) {
|
|
delete head;
|
|
}
|
|
}
|
|
|
|
void
|
|
SmartCardThreadList::Remove(SECMODModule *aModule)
|
|
{
|
|
for (SmartCardThreadEntry* current = head; current;
|
|
current = current->next) {
|
|
if (current->thread->GetModule() == aModule) {
|
|
// NOTE: automatically stops the thread and dequeues it from the list
|
|
delete current;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
// adopts the thread passed to it. Starts the thread as well
|
|
nsresult
|
|
SmartCardThreadList::Add(SmartCardMonitoringThread* thread)
|
|
{
|
|
SmartCardThreadEntry* current = new SmartCardThreadEntry(thread, head,
|
|
nullptr, &head);
|
|
// OK to forget current here, it's on the list.
|
|
Unused << current;
|
|
|
|
return thread->Start();
|
|
}
|
|
|
|
|
|
// We really should have a Unity PL Hash function...
|
|
static PLHashNumber
|
|
unity(const void* key) { return PLHashNumber(NS_PTR_TO_INT32(key)); }
|
|
|
|
SmartCardMonitoringThread::SmartCardMonitoringThread(SECMODModule* module_)
|
|
: mThread(nullptr)
|
|
{
|
|
mModule = SECMOD_ReferenceModule(module_);
|
|
// simple hash functions, most modules have less than 3 slots, so 10 buckets
|
|
// should be plenty
|
|
mHash = PL_NewHashTable(10, unity, PL_CompareValues, PL_CompareStrings,
|
|
nullptr, 0);
|
|
}
|
|
|
|
//
|
|
// when we shutdown the thread, be sure to stop it first. If not, it just might
|
|
// crash when the mModule it is looking at disappears.
|
|
//
|
|
SmartCardMonitoringThread::~SmartCardMonitoringThread()
|
|
{
|
|
Stop();
|
|
SECMOD_DestroyModule(mModule);
|
|
if (mHash) {
|
|
PL_HashTableDestroy(mHash);
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
SmartCardMonitoringThread::Start()
|
|
{
|
|
if (!mThread) {
|
|
mThread = PR_CreateThread(PR_SYSTEM_THREAD, LaunchExecute, this,
|
|
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
|
|
PR_JOINABLE_THREAD, 0);
|
|
}
|
|
return mThread ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
//
|
|
// Should only stop if we are through with the module.
|
|
// CancelWait has the side effect of losing all the keys and
|
|
// current operations on the module!. (See the comment in
|
|
// SECMOD_CancelWait for why this is so..).
|
|
//
|
|
void SmartCardMonitoringThread::Stop()
|
|
{
|
|
SECStatus rv;
|
|
|
|
rv = SECMOD_CancelWait(mModule);
|
|
if (rv != SECSuccess) {
|
|
// we didn't wake up the Wait, so don't try to join the thread
|
|
// otherwise we will hang forever...
|
|
return;
|
|
}
|
|
|
|
// confused about the memory model here? NSPR owns the memory for
|
|
// threads. non-joinable threads are freed when the thread dies.
|
|
// joinable threads are freed after the call to PR_JoinThread.
|
|
// That means if SECMOD_CancelWait fails, we'll leak the mThread
|
|
// structure. this is considered preferable to hanging (which is
|
|
// what will happen if we try to join a thread that blocked).
|
|
if (mThread) {
|
|
PR_JoinThread(mThread);
|
|
mThread = 0;
|
|
}
|
|
}
|
|
|
|
//
|
|
// remember the name and series of a token in a particular slot.
|
|
// This is important because the name is no longer available when
|
|
// the token is removed. If listeners depended on this information,
|
|
// They would be out of luck. It also is a handy way of making sure
|
|
// we don't generate spurious insertion and removal events as the slot
|
|
// cycles through various states.
|
|
//
|
|
void
|
|
SmartCardMonitoringThread::SetTokenName(CK_SLOT_ID slotid,
|
|
const char* tokenName, uint32_t series)
|
|
{
|
|
if (mHash) {
|
|
if (tokenName) {
|
|
int len = strlen(tokenName) + 1;
|
|
/* this must match the allocator used in
|
|
* PLHashAllocOps.freeEntry DefaultFreeEntry */
|
|
char* entry = (char*)PR_Malloc(len + sizeof(uint32_t));
|
|
|
|
if (entry) {
|
|
memcpy(entry, &series, sizeof(uint32_t));
|
|
memcpy(&entry[sizeof(uint32_t)], tokenName, len);
|
|
|
|
PL_HashTableAdd(mHash, (void*)(uintptr_t)slotid, entry); /* adopt */
|
|
return;
|
|
}
|
|
} else {
|
|
// if tokenName was not provided, remove the old one (implicit delete)
|
|
PL_HashTableRemove(mHash, (void*)(uintptr_t)slotid);
|
|
}
|
|
}
|
|
}
|
|
|
|
// retrieve the name saved above
|
|
const char*
|
|
SmartCardMonitoringThread::GetTokenName(CK_SLOT_ID slotid)
|
|
{
|
|
const char* tokenName = nullptr;
|
|
const char* entry;
|
|
|
|
if (mHash) {
|
|
entry = (const char*)PL_HashTableLookupConst(mHash,
|
|
(void*)(uintptr_t)slotid);
|
|
if (entry) {
|
|
tokenName = &entry[sizeof(uint32_t)];
|
|
}
|
|
}
|
|
return tokenName;
|
|
}
|
|
|
|
// retrieve the series saved in SetTokenName above
|
|
uint32_t
|
|
SmartCardMonitoringThread::GetTokenSeries(CK_SLOT_ID slotid)
|
|
{
|
|
uint32_t series = 0;
|
|
const char* entry;
|
|
|
|
if (mHash) {
|
|
entry = (const char*)PL_HashTableLookupConst(mHash,
|
|
(void*)(uintptr_t)slotid);
|
|
if (entry) {
|
|
memcpy(&series, entry, sizeof(uint32_t));
|
|
}
|
|
}
|
|
return series;
|
|
}
|
|
|
|
//
|
|
// helper function to pass the event off to nsNSSComponent.
|
|
//
|
|
void
|
|
SmartCardMonitoringThread::SendEvent(const nsAString& eventType,
|
|
const char* tokenName)
|
|
{
|
|
// The token name should be UTF8, but it's not clear that this is enforced
|
|
// by NSS. To be safe, we explicitly check here before converting it to
|
|
// UTF16. If it isn't UTF8, we just use an empty string with the idea that
|
|
// consumers of these events should at least be notified that something
|
|
// happened.
|
|
nsAutoString tokenNameUTF16(NS_LITERAL_STRING(""));
|
|
if (IsUTF8(nsDependentCString(tokenName))) {
|
|
tokenNameUTF16.Assign(NS_ConvertUTF8toUTF16(tokenName));
|
|
}
|
|
nsCOMPtr<nsIRunnable> runnable(new nsTokenEventRunnable(eventType,
|
|
tokenNameUTF16));
|
|
NS_DispatchToMainThread(runnable);
|
|
}
|
|
|
|
//
|
|
// This is the main loop.
|
|
//
|
|
void SmartCardMonitoringThread::Execute()
|
|
{
|
|
const char* tokenName;
|
|
|
|
//
|
|
// populate token names for already inserted tokens.
|
|
//
|
|
PK11SlotList* sl = PK11_FindSlotsByNames(mModule->dllName, nullptr, nullptr,
|
|
true);
|
|
|
|
PK11SlotListElement* sle;
|
|
if (sl) {
|
|
for (sle = PK11_GetFirstSafe(sl); sle;
|
|
sle = PK11_GetNextSafe(sl, sle, false)) {
|
|
SetTokenName(PK11_GetSlotID(sle->slot), PK11_GetTokenName(sle->slot),
|
|
PK11_GetSlotSeries(sle->slot));
|
|
}
|
|
PK11_FreeSlotList(sl);
|
|
}
|
|
|
|
// loop starts..
|
|
do {
|
|
UniquePK11SlotInfo slot(
|
|
SECMOD_WaitForAnyTokenEvent(mModule, 0, PR_SecondsToInterval(1)));
|
|
if (!slot) {
|
|
break;
|
|
}
|
|
|
|
// now we have a potential insertion or removal event, see if the slot
|
|
// is present to determine which it is...
|
|
if (PK11_IsPresent(slot.get())) {
|
|
// insertion
|
|
CK_SLOT_ID slotID = PK11_GetSlotID(slot.get());
|
|
uint32_t series = PK11_GetSlotSeries(slot.get());
|
|
|
|
// skip spurious insertion events...
|
|
if (series != GetTokenSeries(slotID)) {
|
|
// if there's a token name, then we have not yet issued a remove
|
|
// event for the previous token, do so now...
|
|
tokenName = GetTokenName(slotID);
|
|
if (tokenName) {
|
|
SendEvent(NS_LITERAL_STRING("smartcard-remove"), tokenName);
|
|
}
|
|
tokenName = PK11_GetTokenName(slot.get());
|
|
// save the token name and series
|
|
SetTokenName(slotID, tokenName, series);
|
|
SendEvent(NS_LITERAL_STRING("smartcard-insert"), tokenName);
|
|
}
|
|
} else {
|
|
// retrieve token name
|
|
CK_SLOT_ID slotID = PK11_GetSlotID(slot.get());
|
|
tokenName = GetTokenName(slotID);
|
|
// if there's not a token name, then the software isn't expecting
|
|
// a (or another) remove event.
|
|
if (tokenName) {
|
|
SendEvent(NS_LITERAL_STRING("smartcard-remove"), tokenName);
|
|
// clear the token name (after we send it)
|
|
SetTokenName(slotID, nullptr, 0);
|
|
}
|
|
}
|
|
} while (1);
|
|
}
|
|
|
|
// accessor to help searching active Monitoring threads
|
|
const SECMODModule* SmartCardMonitoringThread::GetModule()
|
|
{
|
|
return mModule;
|
|
}
|
|
|
|
// C-like calling sequence to glue into PR_CreateThread.
|
|
void SmartCardMonitoringThread::LaunchExecute(void* arg)
|
|
{
|
|
PR_SetCurrentThreadName("SmartCard");
|
|
|
|
((SmartCardMonitoringThread*)arg)->Execute();
|
|
}
|