anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check for IPv4 mapped IPv6 address in PMS logs

Browse Source
This commit is contained in:
Jonathan Wong
2015-11-15 10:26:03 -08:00
parent 18b328a387
commit 1644bbd4b7
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plexpy/activity_processor.py
View File

@@ -279,10 +279,17 @@ class ActivityProcessor(object):
if ipv4: if ipv4:
# The logged IP will always be the first match and we don't want localhost entries # The logged IP will always be the first match and we don't want localhost entries
if ipv4[0] != '127.0.0.1': if ipv4[0] != '127.0.0.1':
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " # check if IPv4 mapped IPv6 address (::ffff:xxx.xxx.xxx.xxx)
u"and machineIdentifier %s." if '::ffff:' + ipv4[0] in line:
% (ipv4[0], rating_key, machine_id)) logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
return ipv4[0] u"and machineIdentifier %s."
% ('::ffff:' + ipv4[0], rating_key, machine_id))
return '::ffff:' + ipv4[0]
else:
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
u"and machineIdentifier %s."
% (ipv4[0], rating_key, machine_id))
return ipv4[0]
logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on first pass. " logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on first pass. "
u"Attempting fallback check in 5 seconds...") u"Attempting fallback check in 5 seconds...")
@@ -302,9 +309,14 @@ class ActivityProcessor(object):
if ipv4: if ipv4:
# The logged IP will always be the first match and we don't want localhost entries # The logged IP will always be the first match and we don't want localhost entries
if ipv4[0] != '127.0.0.1': if ipv4[0] != '127.0.0.1':
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % if '::ffff:' + ipv4[0] in line:
(ipv4[0], rating_key)) logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
return ipv4[0] ('::ffff:' + ipv4[0], rating_key))
return '::ffff:' + ipv4[0]
else:
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
(ipv4[0], rating_key))
return ipv4[0]
logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on fallback search. Not logging IP address.") logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on fallback search. Not logging IP address.")