Merge f924d19 into 20bfa7e

pyps4/connection.py

@@ -57,10 +57,13 @@ def disconnect(self):
         self._reset_crypto_init_vector()
         self._random_seed = None
 
-    def login(self):
+    def login(self, pin=None):
         """Login."""
         _LOGGER.debug('Login')
-        self._send_login_request()
+        if pin is None:
+            self._send_login_request()
+        else:
+            self._send_login_request(pin)
         msg = self._recv_msg()
         msg = self._decipher.decrypt(msg)
         _LOGGER.debug('RX: %s %s', len(msg), binascii.hexlify(msg))
@@ -150,7 +153,7 @@ def _send_handshake_request(self, seed):
         msg = fmt.build({'key': key, 'seed': seed})
         self._send_msg(msg)
 
-    def _send_login_request(self):
+    def _send_login_request(self, pin=None):
         fmt = Struct(
             'length' / Const(b'\x80\x01\x00\x00'),
             'type' / Const(b'\x1e\x00\x00\x00'),
@@ -163,12 +166,17 @@ def _send_login_request(self):
             'pin_code' / Bytes(16),
         )
 
+        if pin is None:
+            self.pin = b''
+        else:
+            self.pin = pin.encode()
+
         config = {
             'app_label': b'PlayStation'.ljust(256, b'\x00'),
             'account_id': self._credential.encode().ljust(64, b'\x00'),
             'os_version': b'4.4'.ljust(16, b'\x00'),
             'model': b'PS4 Waker'.ljust(16, b'\x00'),
-            'pin_code': b''.ljust(16, b'\x00'),
+            'pin_code': self.pin.ljust(16, b'\x00'),
         }
 
         _LOGGER.debug('config %s', config)

pyps4/ps4.py

@@ -78,10 +78,10 @@ def wakeup(self):
         """Wakeup."""
         wakeup(self._host, self._credential)
 
-    def login(self):
+    def login(self, pin=None):
         """Login."""
         self.open()
-        self._connection.login()
+        self._connection.login(pin)
         self.close()
 
     def standby(self):