diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index aa5a80f..5a5fd60 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -38,33 +38,43 @@
           {
             "id": "9c276221889aa33a",
             "type": "leaf",
+            "state": {
+              "type": "image",
+              "state": {
+                "file": "TERCERO/ATR1/images/Pasted image 20241127110759.png"
+              },
+              "icon": "lucide-image",
+              "title": "Pasted image 20241127110759"
+            }
+          },
+          {
+            "id": "fdf44efc147788ae",
+            "type": "leaf",
+            "state": {
+              "type": "image",
+              "state": {
+                "file": "TERCERO/ATR1/images/Pasted image 20241127111215.png"
+              },
+              "icon": "lucide-image",
+              "title": "Pasted image 20241127111215"
+            }
+          },
+          {
+            "id": "1ca3e3801d0cdb51",
+            "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "TERCERO/IA/Teoría_2425.md",
+                "file": "TERCERO/ATR1/Teoría_2425.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
               "title": "Teoría_2425"
             }
-          },
-          {
-            "id": "ac6226a7980625a3",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "conflict-files-obsidian-git.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "conflict-files-obsidian-git"
-            }
           }
         ],
-        "currentTab": 3
+        "currentTab": 4
       }
     ],
     "direction": "vertical"
@@ -217,25 +227,25 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "ac6226a7980625a3",
+  "active": "1ca3e3801d0cdb51",
   "lastOpenFiles": [
     "TERCERO/IA/Teoría_2425.md",
-    "conflict-files-obsidian-git.md",
-    "Pasted image 20241127111215.png",
-    "Pasted image 20241127110759.png",
-    "Pasted image 20241202205510.png",
-    "TERCERO/SPD/Teoría_2425.md",
-    "Pasted image 20241202214411.png",
-    "Pasted image 20241202214354.png",
-    "Pasted image 20241202214247.png",
-    "Pasted image 20241202214242.png",
-    "Pasted image 20241202214114.png",
-    "Pasted image 20241202214112.png",
-    "Pasted image 20241202213603.png",
-    "TERCERO/SS/SS Lab.md",
-    "SEGUNDO/IISSI1/Teoría_2324.md",
+    "TERCERO/ATR1/images/Pasted image 20241204111952.png",
+    "TERCERO/ATR1/images/Pasted image 20241204111556.png",
+    "TERCERO/ATR1/images/Pasted image 20241204110546.png",
+    "TERCERO/ATR1/images/Pasted image 20241204105723.png",
+    "TERCERO/ATR1/images/Pasted image 20241204105459.png",
     "TERCERO/ATR1/Teoría_2425.md",
+    "TERCERO/SPD/Teoría_2425.md",
+    "TERCERO/SPD/images/Pasted image 20241202205510.png",
+    "TERCERO/SPD/images/Pasted image 20241202214411.png",
+    "TERCERO/SPD/images/Pasted image 20241202214354.png",
+    "TERCERO/SPD/images/Pasted image 20241202214247.png",
+    "TERCERO/SPD/images/Pasted image 20241202214242.png",
     "TERCERO/SS/SS 24-25.md",
+    "TERCERO/SS/SS Lab.md",
+    "conflict-files-obsidian-git.md",
+    "SEGUNDO/IISSI1/Teoría_2324.md",
     "Untitled.md",
     "TERCERO/ATR1/Resolución 1 Parcial ATR1.md",
     "TERCERO/ATR1/Ejercicios.md",
diff --git a/TERCERO/ATR1/Teoría_2425.md b/TERCERO/ATR1/Teoría_2425.md
index 485b1a1..a6fdaf5 100644
--- a/TERCERO/ATR1/Teoría_2425.md
+++ b/TERCERO/ATR1/Teoría_2425.md
@@ -488,4 +488,58 @@ Se guardan en cada mensaje y permiten señalar si se ha marcado para borrar, si
 #### <mark style="background: #ABF7F7A6;">Ejemplo IMAP 2</mark>
 ![[Pasted image 20241127111215.png]]
 **UID fetch:** permite obtener determinados datos sobre determinados mensajes.
-**IDLE:** permite al cliente permanecer a la espera de actualizaciones del buzón.
\ No newline at end of file
+**IDLE:** permite al cliente permanecer a la espera de actualizaciones del buzón.
+# <mark style="background: #FFF3A3A6;">TEMA 5: Servicio de transferencia de ficheros</mark>
+## <mark style="background: #ADCCFFA6;">1. TFTP</mark>
+Es un protocolo muy simple y **NO** fiable (usa UDP, puerto 69). Sin carpetas ni encriptación.
+### <mark style="background: #FFB86CA6;">Mensajes TFTP</mark>
+Códigos de operación:
+- 01: RRQ (Read Request): petición de lectura
+- 02: WRQ (Write Request): petición de escritura
+- 03: DATA
+- 04: ACK
+- 05: Mensaje de error
+Son de longitud variable según el opcode.
+![[Pasted image 20241204105459.png]]
+#### <mark style="background: #D2B3FFA6;">RRQ - WRQ</mark> 
+  ![[Pasted image 20241204105723.png]]
+- Primer mensaje que se envía al puerto del cliente para descargar un archivo.
+- Después de RRQ aparece un DATA o error.
+- Modo de transmisión: "netascii" u "octet".
+- N opciones con N valores
+- El formato de WRQ es el mismo que RRQ pero con opcode = 02
+- Después de WRQ aparece un ACK o error
+#### <mark style="background: #D2B3FFA6;">DATA - ACK</mark>
+![[Pasted image 20241204110546.png]]
+- Número de bloque: 1-65535 (garantiza el orden de los datos)
+- El formato de ACK es el mismo que el de DATA pero con opcode = 04 y sin bloques de datos.
+- El último bloque (del fichero) se reconoce porque mide menos de 512B.
+- **Problema:** con archivos largos, la pérdida de un mensaje significa la necesidad de retransmitir TODO el fichero, si antes se solicita.
+#### <mark style="background: #D2B3FFA6;">Error</mark>
+![[Pasted image 20241204111556.png]]
+- Código de error: causa del error
+	- 0 - No definido (ver cadena explicativa)
+	- 1 - File not found
+	- 2 - Access violation (no hay permiso r/w para acceder al fichero)
+	- 3 - Disk full
+	- 6 - File already exists
+## <mark style="background: #ADCCFFA6;">2. FTP</mark>
+![[Pasted image 20241204111952.png]]
+- Transferencia de ficheros entre hosts remotos.
+- Paradigma Cliente-Servidor, Comando-Respuesta.
+- Transferencia fiable (TCP; puertos 20 y 21).
+	- Usa dos conexiones:
+		- **Datos:** transferir los datos
+		- **Control:** permite al usuario moverse por el sistema de ficheros, descargar y subir archivos.
+- Los parámetros de conexión se negocian en el establecimiento:
+	- Puerto de datos
+	- Modo de conexión: activo/pasivo
+		- **Activo:** el servidor crea la conexión de datos.
+		- **Pasivo:** el servidor espera a que el cliente cree la conexión de datos.
+	- Modo de transferencia: ASCII/bin
+## <mark style="background: #ADCCFFA6;">3. Comandos</mark>
+- **USER:** username
+- **PASS:** password
+- **LIST** lista de archivos de un directorio
+- **RETR _filename_:** transfiere el archivo indicado
+- **STOR _filename_:** almacena en el servidor el archivo indicado
diff --git a/Pasted image 20241127110759.png b/TERCERO/ATR1/images/Pasted image 20241127110759.png
similarity index 100%
rename from Pasted image 20241127110759.png
rename to TERCERO/ATR1/images/Pasted image 20241127110759.png
diff --git a/Pasted image 20241127111215.png b/TERCERO/ATR1/images/Pasted image 20241127111215.png
similarity index 100%
rename from Pasted image 20241127111215.png
rename to TERCERO/ATR1/images/Pasted image 20241127111215.png
diff --git a/TERCERO/ATR1/images/Pasted image 20241204105459.png b/TERCERO/ATR1/images/Pasted image 20241204105459.png
new file mode 100644
index 0000000..4a60ccd
Binary files /dev/null and b/TERCERO/ATR1/images/Pasted image 20241204105459.png differ
diff --git a/TERCERO/ATR1/images/Pasted image 20241204105723.png b/TERCERO/ATR1/images/Pasted image 20241204105723.png
new file mode 100644
index 0000000..a1316bf
Binary files /dev/null and b/TERCERO/ATR1/images/Pasted image 20241204105723.png differ
diff --git a/TERCERO/ATR1/images/Pasted image 20241204110546.png b/TERCERO/ATR1/images/Pasted image 20241204110546.png
new file mode 100644
index 0000000..a78a4a1
Binary files /dev/null and b/TERCERO/ATR1/images/Pasted image 20241204110546.png differ
diff --git a/TERCERO/ATR1/images/Pasted image 20241204111556.png b/TERCERO/ATR1/images/Pasted image 20241204111556.png
new file mode 100644
index 0000000..cc0ac69
Binary files /dev/null and b/TERCERO/ATR1/images/Pasted image 20241204111556.png differ
diff --git a/TERCERO/ATR1/images/Pasted image 20241204111952.png b/TERCERO/ATR1/images/Pasted image 20241204111952.png
new file mode 100644
index 0000000..5736e13
Binary files /dev/null and b/TERCERO/ATR1/images/Pasted image 20241204111952.png differ
diff --git a/Pasted image 20241202205510.png b/TERCERO/SPD/images/Pasted image 20241202205510.png
similarity index 100%
rename from Pasted image 20241202205510.png
rename to TERCERO/SPD/images/Pasted image 20241202205510.png
diff --git a/Pasted image 20241202213354.png b/TERCERO/SPD/images/Pasted image 20241202213354.png
similarity index 100%
rename from Pasted image 20241202213354.png
rename to TERCERO/SPD/images/Pasted image 20241202213354.png
diff --git a/Pasted image 20241202213404.png b/TERCERO/SPD/images/Pasted image 20241202213404.png
similarity index 100%
rename from Pasted image 20241202213404.png
rename to TERCERO/SPD/images/Pasted image 20241202213404.png
diff --git a/Pasted image 20241202213603.png b/TERCERO/SPD/images/Pasted image 20241202213603.png
similarity index 100%
rename from Pasted image 20241202213603.png
rename to TERCERO/SPD/images/Pasted image 20241202213603.png
diff --git a/Pasted image 20241202214112.png b/TERCERO/SPD/images/Pasted image 20241202214112.png
similarity index 100%
rename from Pasted image 20241202214112.png
rename to TERCERO/SPD/images/Pasted image 20241202214112.png
diff --git a/Pasted image 20241202214114.png b/TERCERO/SPD/images/Pasted image 20241202214114.png
similarity index 100%
rename from Pasted image 20241202214114.png
rename to TERCERO/SPD/images/Pasted image 20241202214114.png
diff --git a/Pasted image 20241202214242.png b/TERCERO/SPD/images/Pasted image 20241202214242.png
similarity index 100%
rename from Pasted image 20241202214242.png
rename to TERCERO/SPD/images/Pasted image 20241202214242.png
diff --git a/Pasted image 20241202214247.png b/TERCERO/SPD/images/Pasted image 20241202214247.png
similarity index 100%
rename from Pasted image 20241202214247.png
rename to TERCERO/SPD/images/Pasted image 20241202214247.png
diff --git a/Pasted image 20241202214354.png b/TERCERO/SPD/images/Pasted image 20241202214354.png
similarity index 100%
rename from Pasted image 20241202214354.png
rename to TERCERO/SPD/images/Pasted image 20241202214354.png
diff --git a/Pasted image 20241202214411.png b/TERCERO/SPD/images/Pasted image 20241202214411.png
similarity index 100%
rename from Pasted image 20241202214411.png
rename to TERCERO/SPD/images/Pasted image 20241202214411.png
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index 5d4c1c5..0000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Conflicts
-Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
-(This file will automatically be deleted before commit)
-[[#Additional Instructions]] available below file list
-
-- Not a file: .obsidian/workspace.json
-- [[conflict-files-obsidian-git]]
-
-# Additional Instructions
-I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
-
-```diff
-<<<<<<< HEAD
-    File changes in local repository
-=======
-    File changes in remote repository
->>>>>>> origin/main
-```
\ No newline at end of file